Author: nicodvb Date: Mon Apr 30 11:14:08 2007 New Revision: 930 Log: even in the new build system, when compiling the library without the dvdread code call it libdvdnavmini Modified: trunk/libdvdnav/Makefile Modified: trunk/libdvdnav/Makefile ============================================================================== --- trunk/libdvdnav/Makefile (original) +++ trunk/libdvdnav/Makefile Mon Apr 30 11:14:08 2007 @@ -16,16 +16,13 @@ SRCS+= decoder.c vm.c vmcmd.c HEADERS += src/dvd_types.h src/dvdnav.h src/dvdnav_events.h -L=libdvdnav -LIB = $(L).a -SHLIB = $(L).so - CFLAGS += $(USEDEBUG) -Wall -funsigned-char CFLAGS += -I$(CURDIR) -I$(SRC_PATH)/src -I$(SRC_PATH)/src/vm CFLAGS += -DDVDNAV_COMPILE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE CFLAGS += -DHAVE_CONFIG_H -DHAVE_DLFCN_H ifeq ($(DVDREAD),internal) +L=libdvdnav VPATH+= $(SRC_PATH_BARE)/src/dvdread HEADERS = src/dvdread/dvd_reader.h \ src/dvdread/ifo_print.h \ @@ -38,9 +35,13 @@ SRCS+= dvd_input.c dvd_reader.c dvd_udf. md5.c nav_print.c nav_read.c CFLAGS += -I$(SRC_PATH)/src/dvdread else +L=libdvdnavmini CFLAGS += -I$(DVDREAD_DIR) endif +LIB = $(L).a +SHLIB = $(L).so + LIBS_INSTALL = $(CURDIR)/../lib INCLUDES_INSTALL = $(CURDIR)/../include/libhts