Author: nicodvb Date: Wed Apr 25 20:10:11 2007 New Revision: 903 Log: first, minimalistic support for dvdnav-config Added: trunk/libdvdnav/misc/dvdnav-config2.sh - copied, changed from r900, /trunk/libdvdnav/misc/dvdnav-config.in Modified: trunk/libdvdnav/Makefile Modified: trunk/libdvdnav/Makefile ============================================================================== --- trunk/libdvdnav/Makefile (original) +++ trunk/libdvdnav/Makefile Wed Apr 25 20:10:11 2007 @@ -54,13 +54,13 @@ DEPS= ${OBJS:%.o=%.d} BUILDDEPS = Makefile config.mak ifeq ($(BUILD_SHARED),yes) -all: $(SHLIB) -install: $(SHLIB) install-shared +all: $(SHLIB) dvdnav-config +install: $(SHLIB) install-shared install-dvdnav-config endif ifeq ($(BUILD_STATIC),yes) -all: $(LIB) -install: $(LIB) install-static +all: $(LIB) dvdnav-config +install: $(LIB) install-static install-dvdnav-config endif install: install-headers @@ -128,6 +128,16 @@ distclean: clean find . -name "*~" | xargs rm -rf rm -rf config.mak +dvdnav-config: + echo -e '#!/bin/sh\n\nprefix='$(PREFIX)'\n' > $(SRC_PATH_BARE)/$(.OBJDIR)/dvdnav-config + echo -e 'version='$(SHLIB_VERSION)'\n' >> $(SRC_PATH_BARE)/$(.OBJDIR)/dvdnav-config + echo -e 'threadlib='$(THREADLIB)'\n\n' >> $(SRC_PATH_BARE)/$(.OBJDIR)/dvdnav-config + cat $(SRC_PATH_BARE)/misc/dvdnav-config2.sh >> $(SRC_PATH_BARE)/$(.OBJDIR)/dvdnav-config + chmod 0755 $(SRC_PATH_BARE)/$(.OBJDIR)/dvdnav-config + +install-dvdnav-config: + install -m 0755 $(SRC_PATH_BARE)/$(.OBJDIR)/dvdnav-config $(PREFIX)/bin/dvdnav-config + vpath %.so ${.OBJDIR} vpath %.o ${.OBJDIR} Copied: trunk/libdvdnav/misc/dvdnav-config2.sh (from r900, /trunk/libdvdnav/misc/dvdnav-config.in) ============================================================================== --- /trunk/libdvdnav/misc/dvdnav-config.in (original) +++ trunk/libdvdnav/misc/dvdnav-config2.sh Wed Apr 25 20:10:11 2007 @@ -1,10 +1,3 @@ -#!/bin/sh -# -# - -prefix=@prefix@ -exec_prefix=@exec_prefix@ -exec_prefix_set=no usage() { @@ -12,7 +5,6 @@ usage() Usage: dvdnav-config [OPTIONS] [LIBRARIES] Options: [--prefix[=DIR]] - [--exec-prefix[=DIR]] [--version] [--libs] [--cflags] @@ -31,24 +23,11 @@ while test $# -gt 0; do esac case $1 in - --prefix=*) - prefix=$optarg - if test $exec_prefix_set = no ; then - exec_prefix=$optarg - fi - ;; --prefix) echo_prefix=yes ;; - --exec-prefix=*) - exec_prefix=$optarg - exec_prefix_set=yes - ;; - --exec-prefix) - echo_exec_prefix=yes - ;; --version) - echo @DVDNAV_MAJOR@.@DVDNAV_MINOR@.@DVDNAV_SUB@ + echo $version ;; --cflags) echo_cflags=yes @@ -67,14 +46,10 @@ if test "$echo_prefix" = "yes"; then echo $prefix fi -if test "$echo_exec_prefix" = "yes"; then - echo $exec_prefix -fi - if test "$echo_cflags" = "yes"; then - echo -I@includedir@ -I@includedir@/dvdnav @THREAD_CFLAGS@ + echo -I$prefix -I$prefix/dvdnav $threadcflags fi if test "$echo_libs" = "yes"; then - echo -L@libdir@ -ldvdnav @THREAD_LIBS@ + echo -L$prefix -ldvdnav $threadlib fi