[Vidix-devel] SF.net SVN: vidix:[333] trunk/vidix

[<nic...@us...>]

Revision: 333
          http://vidix.svn.sourceforge.net/vidix/?rev=333&view=rev
Author:   nickols_k
Date:     2008-10-30 18:48:21 +0000 (Thu, 30 Oct 2008)

Log Message:
-----------
dual-ABI support

Modified Paths:
--------------
    trunk/vidix/configure
    trunk/vidix/libdha/Makefile
    trunk/vidix/vidix/Makefile
    trunk/vidix/vidix/drivers/Makefile

Modified: trunk/vidix/configure
===================================================================
--- trunk/vidix/configure	2008-10-30 17:20:50 UTC (rev 332)
+++ trunk/vidix/configure	2008-10-30 18:48:21 UTC (rev 333)
@@ -6,13 +6,16 @@
 VERSION_MICRO=0
 
 # The simplest configure for the vidix
+check_cmd(){
+    log "$@"
+    "$@" >>"$TMPLOG" 2>&1
+}
+
 cc_check() {
   echo >> "$TMPLOG"
   cat "$TMPC" >> "$TMPLOG"
   echo >> "$TMPLOG"
-  echo "$_cc $_inc_extra $_ld_static $_ld_extra $TMPC -o $TMPO $@" >> "$TMPLOG"
-  > "$TMPO"
-  ( "$_cc" $_inc_extra $_ld_static $_ld_extra "$TMPC" -o "$TMPO" "$@" ) >> "$TMPLOG" 2>&1
+  check_cmd $_cc $CFLAGS "$@" -c -o $TMPO $TMPC
   TMP="$?"
   echo >> "$TMPLOG"
   echo "ldd $TMPO" >> "$TMPLOG"
@@ -98,6 +101,8 @@
                          data files [PREFIX/share/vidix]
   --confdir=DIR          use this prefix for installing configuration files
                          [same as datadir]
+  --libdir=DIR           use this prefix for installing shared objects
+                         [same as datadir]
 
 Use these options if autodetection fails:
   --with-extraincdir=DIR   extra headers in DIR
@@ -132,6 +137,7 @@
 TMPS="$I/vidix-conf-$RANDOM-$$.S"
 
 _cc=gcc
+test "$CC" && _cc="$CC"
 _prefix="/usr/local"
 
 # checking for OS name
@@ -252,6 +258,9 @@
   --confdir=*)
     _confdir=`echo $ac_option | cut -d '=' -f 2`
     ;;
+  --libdir=*)
+    _libdir=`echo $ac_option | cut -d '=' -f 2`
+    ;;
   --with-extraincdir=*)
     _inc_extra=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'`
     ;;

Modified: trunk/vidix/libdha/Makefile
===================================================================
--- trunk/vidix/libdha/Makefile	2008-10-30 17:20:50 UTC (rev 332)
+++ trunk/vidix/libdha/Makefile	2008-10-30 18:48:21 UTC (rev 333)
@@ -82,24 +82,24 @@
 	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
 
 install:
-	-mkdir -p $(prefix)/lib
+	-mkdir -p $(LIBDIR)
 ifeq ($(VIDIX_BUILD_SHARED),yes)
-	install -D -m 755 -s -p $(LIBNAME_SHARED_VERSION) $(prefix)/lib/$(LIBNAME_SHARED_VERSION)
-	ln -sf $(LIBNAME_SHARED_VERSION) $(prefix)/lib/$(LIBNAME_SHARED)
-	ln -sf $(LIBNAME_SHARED_VERSION) $(prefix)/lib/$(LIBNAME_SHARED_MAJOR)
+	install -D -m 755 -s -p $(LIBNAME_SHARED_VERSION) $(LIBDIR)/$(LIBNAME_SHARED_VERSION)
+	ln -sf $(LIBNAME_SHARED_VERSION) $(LIBDIR)/$(LIBNAME_SHARED)
+	ln -sf $(LIBNAME_SHARED_VERSION) $(LIBDIR)/$(LIBNAME_SHARED_MAJOR)
 	-$(LDCONFIG) $(LDCONFIG_FLAGS)
 endif
 ifeq ($(VIDIX_BUILD_STATIC),yes)
-	cp -f $(LIBNAME_STATIC) $(prefix)/lib/$(LIBNAME_STATIC)
+	cp -f $(LIBNAME_STATIC) $(LIBDIR)/$(LIBNAME_STATIC)
 endif
 
 uninstall:
 ifeq ($(VIDIX_BUILD_SHARED),yes)
-	rm -f $(prefix)/lib/$(LIBNAME_SHARED)*
+	rm -f $(LIBDIR)/$(LIBNAME_SHARED)*
 	-$(LDCONFIG) $(LDCONFIG_FLAGS)
 endif
 ifeq ($(VIDIX_BUILD_STATIC),yes)
-	rm -f $(prefix)/lib/$(LIBNAME_STATIC)
+	rm -f $(LIBDIR)/$(LIBNAME_STATIC)
 endif
 
 ifneq ($(wildcard .depend),)

Modified: trunk/vidix/vidix/Makefile
===================================================================
--- trunk/vidix/vidix/Makefile	2008-10-30 17:20:50 UTC (rev 332)
+++ trunk/vidix/vidix/Makefile	2008-10-30 18:48:21 UTC (rev 333)
@@ -8,7 +8,6 @@
 LIBNAME_STATIC         = $(NAME).a
 LIBNAME_WIN32          = $(NAME).dll
 
-LIBDIR = $(prefix)/lib
 INCDIR = $(prefix)/include/vidix
 
 SRCS        = vidixlib.c
@@ -71,12 +70,12 @@
 	mkdir -p $(LIBDIR)
 ifeq ($(VIDIX_BUILD_SHARED),yes)
 	install -m 755 -s -p $(LIBNAME_SHARED_VERSION) $(LIBDIR)
-	ln -sf $(LIBNAME_SHARED_VERSION) $(prefix)/lib/$(LIBNAME_SHARED)
-	ln -sf $(LIBNAME_SHARED_VERSION) $(prefix)/lib/$(LIBNAME_SHARED_MAJOR)
+	ln -sf $(LIBNAME_SHARED_VERSION) $(LIBDIR)/$(LIBNAME_SHARED)
+	ln -sf $(LIBNAME_SHARED_VERSION) $(LIBDIR)/$(LIBNAME_SHARED_MAJOR)
 	-$(LDCONFIG) $(LDCONFIG_FLAGS)
 endif
 ifeq ($(VIDIX_BUILD_STATIC),yes)
-	cp -f $(LIBNAME_STATIC) $(prefix)/lib
+	cp -f $(LIBNAME_STATIC) $(LIBDIR)
 endif
 
 	mkdir -p $(INCDIR)

Modified: trunk/vidix/vidix/drivers/Makefile
===================================================================
--- trunk/vidix/vidix/drivers/Makefile	2008-10-30 17:20:50 UTC (rev 332)
+++ trunk/vidix/vidix/drivers/Makefile	2008-10-30 18:48:21 UTC (rev 333)
@@ -1,6 +1,6 @@
 include ../../config.mak
 
-LIBDIR = $(prefix)/lib/vidix
+DRV_LIBDIR = $(LIBDIR)/vidix
 OLDLIBDIR = $(prefix)/lib/mplayerxp/vidix
 
 VIDIX_LIBS = -L../../libdha -ldha
@@ -113,13 +113,13 @@
 	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
 
 install:
-	mkdir -p $(LIBDIR)
-	install -m 755 -p *.so $(LIBDIR)
+	mkdir -p $(DRV_LIBDIR)
+	install -m 755 -p *.so $(DRV_LIBDIR)
 	if test -d $(OLDLIBDIR) ; then rm -f $(OLDLIBDIR)/*.so ; rmdir -p --ignore-fail-on-non-empty $(OLDLIBDIR) ; fi
 
 uninstall:
-	rm -f $(LIBDIR)/*.so
-	rmdir -p --ignore-fail-on-non-empty $(LIBDIR)
+	rm -f $(DRV_LIBDIR)/*.so
+	rmdir -p --ignore-fail-on-non-empty $(DRV_LIBDIR)
 
 ifneq ($(wildcard .depend),)
 include .depend


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.