Commit 6b2e82a0 authored by Reimar Döffinger's avatar Reimar Döffinger

Move installed headers into dvdread directory to make them easier to

use in a consistent way without installing.

parent f886dd77
......@@ -18,15 +18,15 @@ DVDREAD_L=libdvdread
DVDREAD_LIB = $(DVDREAD_L).a
DVDREAD_SHLIB = $(DVDREAD_L).so
VPATH+= $(SRC_PATH_BARE)/src
DVDREAD_HEADERS = src/dvd_reader.h \
src/ifo_print.h \
src/ifo_read.h \
src/ifo_types.h \
src/nav_print.h \
src/nav_read.h \
src/dvd_udf.h \
src/nav_types.h \
src/bitreader.h
DVDREAD_HEADERS = src/dvdread/dvd_reader.h \
src/dvdread/ifo_print.h \
src/dvdread/ifo_read.h \
src/dvdread/ifo_types.h \
src/dvdread/nav_print.h \
src/dvdread/nav_read.h \
src/dvdread/dvd_udf.h \
src/dvdread/nav_types.h \
src/dvdread/bitreader.h
DVDREAD_SRCS = dvd_input.c dvd_reader.c dvd_udf.c ifo_print.c ifo_read.c \
md5.c nav_print.c nav_read.c bitreader.c
CFLAGS += -I$(SRC_PATH)/src
......
......@@ -15,5 +15,5 @@ libdvdread_la_LIBADD = $(DYNAMIC_LD_LIBS)
libdvdread_la_LDFLAGS = -version-info $(DVDREAD_LT_CURRENT):$(DVDREAD_LT_REVISION):$(DVDREAD_LT_AGE) \
-export-symbols-regex "(^dvd.*|^nav.*|^ifo.*|^DVD.*|^UDF.*)"
include_HEADERS = dvd_reader.h nav_read.h ifo_read.h \
nav_print.h ifo_print.h ifo_types.h nav_types.h dvd_udf.h bitreader.h
include_HEADERS = dvdread/dvd_reader.h dvdread/nav_read.h dvdread/ifo_read.h \
dvdread/nav_print.h dvdread/ifo_print.h dvdread/ifo_types.h dvdread/nav_types.h dvdread/dvd_udf.h dvdread/bitreader.h
......@@ -25,7 +25,7 @@
#include <string.h>
#include <inttypes.h>
#include "bitreader.h"
#include "dvdread/bitreader.h"
int dvdread_getbits_init(getbits_state_t *state, uint8_t *start) {
if ((state == NULL) || (start == NULL)) return 0;
......
......@@ -26,7 +26,7 @@
#include <fcntl.h>
#include <unistd.h>
#include "dvd_reader.h"
#include "dvdread/dvd_reader.h"
#include "dvd_input.h"
......
......@@ -65,9 +65,9 @@ static inline int _private_gettimeofday( struct timeval *tv, void *tz )
#include <mntent.h>
#endif
#include "dvd_udf.h"
#include "dvdread/dvd_udf.h"
#include "dvd_input.h"
#include "dvd_reader.h"
#include "dvdread/dvd_reader.h"
#include "md5.h"
#define DEFAULT_UDF_CACHE_LEVEL 1
......
......@@ -39,8 +39,8 @@
#include <unistd.h>
#include <inttypes.h>
#include "dvd_reader.h"
#include "dvd_udf.h"
#include "dvdread/dvd_reader.h"
#include "dvdread/dvd_udf.h"
/* Private but located in/shared with dvd_reader.c */
extern int UDFReadBlocksRaw( dvd_reader_t *device, uint32_t lb_number,
......
......@@ -33,7 +33,7 @@
#include <inttypes.h>
#include "dvd_reader.h"
#include "dvdread/dvd_reader.h"
#ifdef __cplusplus
extern "C" {
......
......@@ -23,7 +23,7 @@
#define LIBDVDREAD_IFO_READ_H
#include "ifo_types.h"
#include "dvd_reader.h"
#include "dvdread/dvd_reader.h"
#ifdef __cplusplus
extern "C" {
......
......@@ -23,7 +23,7 @@
#define LIBDVDREAD_IFO_TYPES_H
#include <inttypes.h>
#include "dvd_reader.h"
#include "dvdread/dvd_reader.h"
#undef ATTRIBUTE_PACKED
......
......@@ -24,9 +24,9 @@
#include <ctype.h>
#include <assert.h>
#include "ifo_types.h"
#include "ifo_read.h"
#include "ifo_print.h"
#include "dvdread/ifo_types.h"
#include "dvdread/ifo_read.h"
#include "dvdread/ifo_print.h"
/* Put this in some other file / package? It's used in nav_print too. */
static void ifo_print_time(int level, dvd_time_t *dtime) {
......
......@@ -28,11 +28,11 @@
#include <string.h>
#include "bswap.h"
#include "ifo_types.h"
#include "ifo_read.h"
#include "dvd_reader.h"
#include "dvdread/ifo_types.h"
#include "dvdread/ifo_read.h"
#include "dvdread/dvd_reader.h"
#include "dvdread_internal.h"
#include "bitreader.h"
#include "dvdread/bitreader.h"
#ifndef DVD_BLOCK_LEN
#define DVD_BLOCK_LEN 2048
......
......@@ -28,9 +28,9 @@
#include <stdio.h>
#include <inttypes.h>
#include "nav_types.h"
#include "nav_print.h"
#include "ifo_print.h"
#include "dvdread/nav_types.h"
#include "dvdread/nav_print.h"
#include "dvdread/ifo_print.h"
static void navPrint_PCI_GI(pci_gi_t *pci_gi) {
int i;
......
......@@ -26,10 +26,10 @@
#include <inttypes.h>
#include "bswap.h"
#include "nav_types.h"
#include "nav_read.h"
#include "dvdread/nav_types.h"
#include "dvdread/nav_read.h"
#include "dvdread_internal.h"
#include "bitreader.h"
#include "dvdread/bitreader.h"
#define getbits_init dvdread_getbits_init
#define getbits dvdread_getbits
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment