[xiph-commits] r8604 - trunk/oggdsf/src/tools/mod_oggchef

[ozone at motherfish-iii.xiph.org]

Author: ozone
Date: 2005-01-03 23:41:40 -0800 (Mon, 03 Jan 2005)
New Revision: 8604

Modified:
   trunk/oggdsf/src/tools/mod_oggchef/Makefile
   trunk/oggdsf/src/tools/mod_oggchef/modules.mk
Log:
oggdsf:
 * Fix compilation of mod_oggchef on UNIX



Modified: trunk/oggdsf/src/tools/mod_oggchef/Makefile
===================================================================
--- trunk/oggdsf/src/tools/mod_oggchef/Makefile	2005-01-04 04:35:54 UTC (rev 8603)
+++ trunk/oggdsf/src/tools/mod_oggchef/Makefile	2005-01-04 07:41:40 UTC (rev 8604)
@@ -23,7 +23,14 @@
 # default to GNU C++ compiler
 CXX=g++
 
+# force GNU libtool to link with C++ compiler (see Apache 2's build/rules.mk
+# file for where I got these lines from)
+LINK     = $(LIBTOOL) --mode=link $(CXX_COMPILE) $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@
+SH_LINK  = $(SH_LIBTOOL) --mode=link $(CXX_COMPILE) $(LT_LDFLAGS) $(ALL_LDFLAGS) $(SH_LDFLAGS) $(CORE_IMPLIB) $(SH_LIBS) -o $@
+MOD_LINK = $(LIBTOOL) --mode=link $(CXX_COMPILE) -module $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@
 
+
+
 #
 # Tweakage stops here
 #
@@ -34,6 +41,7 @@
 #INCLUDES=-Imy/include/dir
 LIBS=-lOOOgg -lOOOggSeek
 CXXFLAGS=-w
+CFLAGS=-w
 
 #   the default target
 all: local-shared-build

Modified: trunk/oggdsf/src/tools/mod_oggchef/modules.mk
===================================================================
--- trunk/oggdsf/src/tools/mod_oggchef/modules.mk	2005-01-04 04:35:54 UTC (rev 8603)
+++ trunk/oggdsf/src/tools/mod_oggchef/modules.mk	2005-01-04 07:41:40 UTC (rev 8604)
@@ -1,4 +1,4 @@
-mod_oggchef.la: mod_oggchef.slo
+mod_oggchef.la: mod_oggchef.slo anx_time.slo query_utils.slo
 	$(SH_LINK) -rpath $(libexecdir) -module -avoid-version  mod_oggchef.lo
 DISTCLEAN_TARGETS = modules.mk
 shared =  mod_oggchef.la