Author: nicodvb
Date: Sat Apr 19 22:18:35 2008
New Revision: 1015
Log:
added dvdread-config. Hopefully I didn't make a mess with svn cp
Added:
trunk/libdvdnav/misc/dvdread-config.sh
- copied, changed from r1001, /trunk/libdvdnav/misc/dvdnav-config2.sh
Modified:
trunk/libdvdnav/Makefile
Modified: trunk/libdvdnav/Makefile
==============================================================================
--- trunk/libdvdnav/Makefile (original)
+++ trunk/libdvdnav/Makefile Sat Apr 19 22:18:35 2008
@@ -60,13 +60,13 @@ DVDREAD_DEPS= ${DVDREAD_OBJS:%.o=%.d}
BUILDDEPS = Makefile config.mak
ifeq ($(BUILD_SHARED),yes)
-all: $(SHLIB) $(MINI_SHLIB) $(DVDREAD_SHLIB) dvdnav-config
-install: $(SHLIB) $(DVDREAD_SHLIB) install-shared install-dvdnav-config
+all: $(SHLIB) $(MINI_SHLIB) $(DVDREAD_SHLIB) dvdnav-config dvdread-config
+install: $(SHLIB) $(DVDREAD_SHLIB) install-shared install-dvdnav-config install-dvdread-config
endif
ifeq ($(BUILD_STATIC),yes)
-all: $(LIB) $(DVDREAD_LIB) dvdnav-config
-install: $(LIB) $(DVDREAD_LIB) install-static install-dvdnav-config
+all: $(LIB) $(DVDREAD_LIB) dvdnav-config dvdread-config
+install: $(LIB) $(DVDREAD_LIB) install-static install-dvdnav-config install-dvdread-config
endif
install: install-headers
@@ -188,6 +188,18 @@ install-dvdnav-config: dvdnav-config
install -d $(DESTDIR)$(PREFIX)/bin
install -m 0755 $(.OBJDIR)/dvdnav-config $(DESTDIR)$(PREFIX)/bin/dvdnav-config
+dvdread-config: $(.OBJDIR)
+ @echo '#!/bin/sh' > $(.OBJDIR)/dvdread-config
+ @echo 'prefix='$(PREFIX) >> $(.OBJDIR)/dvdread-config
+ @echo 'libdir='$(shlibdir) >> $(.OBJDIR)/dvdread-config
+ @echo 'version='$(SHLIB_VERSION) >> $(.OBJDIR)/dvdread-config
+ @echo >> $(.OBJDIR)/dvdread-config
+ cat $(SRC_PATH_BARE)/misc/dvdread-config.sh >> $(.OBJDIR)/dvdread-config
+ chmod 0755 $(.OBJDIR)/dvdread-config
+
+install-dvdread-config: dvdread-config
+ install -d $(DESTDIR)$(PREFIX)/bin
+ install -m 0755 $(.OBJDIR)/dvdread-config $(DESTDIR)$(PREFIX)/bin/dvdread-config
vpath %.so ${.OBJDIR}
vpath %.o ${.OBJDIR}
Copied: trunk/libdvdnav/misc/dvdread-config.sh (from r1001, /trunk/libdvdnav/misc/dvdnav-config2.sh)
==============================================================================
--- /trunk/libdvdnav/misc/dvdnav-config2.sh (original)
+++ trunk/libdvdnav/misc/dvdread-config.sh Sat Apr 19 22:18:35 2008
@@ -1,21 +1,14 @@
dvdreadlib="-ldvdread"
-dvdreadmsg="[--minilibs]"
-if test "$dvdread" = "external"; then
- dvdreadmsg="[--minicflags]"
- dvdreadcflags="-I$dvdreaddir"
- extracflags="-DDVDNAV_USES_EXTERNAL_DVDREAD"
-fi
usage()
{
cat <<EOF
-Usage: dvdnav-config [OPTIONS] [LIBRARIES]
+Usage: dvdread-config [OPTIONS] [LIBRARIES]
Options:
[--prefix[=DIR]]
[--version]
[--libs]
[--cflags]
- $dvdreadmsg
EOF
exit $1
}
@@ -40,19 +33,9 @@ while test $# -gt 0; do
--cflags)
echo_cflags=yes
;;
- --minicflags)
- if test "$dvdread" = "external"; then
- echo_minicflags=yes
- else
- usage 1 1>&2
- fi
- ;;
--libs)
echo_libs=yes
;;
- --minilibs)
- echo_minilibs=yes
- ;;
*)
usage 1 1>&2
;;
@@ -65,17 +48,9 @@ if test "$echo_prefix" = "yes"; then
fi
if test "$echo_cflags" = "yes"; then
- echo -I$prefix/include $dvdreadcflags $extracflags $threadcflags
-fi
-
-if test "$echo_minicflags" = "yes"; then
- echo -I$prefix/include -I$prefix/include/dvdnav $extracflags $threadcflags
+ echo -I$prefix/include $extracflags
fi
if test "$echo_libs" = "yes"; then
- echo -L$libdir -ldvdnav $dvdreadlib $threadlib
+ echo -L$libdir $dvdreadlib
fi
-
-if test "$echo_minilibs" = "yes"; then
- echo -L$libdir -ldvdnavmini $threadlib
-fi
