"added support for an unusual construct at the start of some

[vlc] / Makefile.opts.in

diff --git a/Makefile.opts.in b/Makefile.opts.in
index 17531bf29562eee0214d7c0571a923db0e6e4f28..ff60ce25f531877ef0b4e32b43198c50cfc32bb8 100644 (file)
--- a/Makefile.opts.in
+++ b/Makefile.opts.in
@@ -65,6 +65,7 @@ includedir = @includedir@
 # Libraries for special cases
 #
 LIB_ALSA = @LIB_ALSA@
+LIB_ALTIVEC = @LIB_ALTIVEC@
 LIB_BEOS = @LIB_BEOS@
 LIB_DARWIN = @LIB_DARWIN@
 LIB_DVD = @LIB_DVD@
@@ -74,7 +75,6 @@ LIB_GGI = @LIB_GGI@
 LIB_GLIDE = @LIB_GLIDE@
 LIB_GNOME = @LIB_GNOME@
 LIB_GTK = @LIB_GTK@
-LIB_IDCTALTIVEC = @LIB_IDCTALTIVEC@
 LIB_LIBDVDCSS = @LIB_LIBDVDCSS@
 LIB_KDE = @LIB_KDE@
 LIB_MACOSX = @LIB_MACOSX@
@@ -91,6 +91,7 @@ LIB_YUV = @LIB_YUV@
 #
 # CFLAGS for special cases
 #
+CFLAGS_ALTIVEC = @CFLAGS_ALTIVEC@
 CFLAGS_DVD = @CFLAGS_DVD@
 CFLAGS_LIBDVDCSS = @CFLAGS_LIBDVDCSS@
 CFLAGS_GTK = @CFLAGS_GTK@
@@ -167,11 +168,14 @@ DEFINE += -D_FILE_OFFSET_BITS=64 -D__USE_UNIX98
 # C headers directories
 #
 INCLUDE += @INCLUDE@
-INCLUDE += -Iinclude -Iextras -I/usr/local/include
+INCLUDE += -Iinclude -Iextras
 
 #
 # Libraries needed by built-in modules
 #
+# Let's go for a crude hack !
+LIB_MOTIONALTIVEC := $(LIB_ALTIVEC)
+LIB_IDCTALTIVEC := $(LIB_ALTIVEC)
 ifneq (,$(BUILTINS))
 LIB_BUILTINS := $(shell for i in ${BUILTINS} ; do echo $$i | tr '[a-z]' '[A-Z]' | sed -e 's/.*/$$LIB_&/' ; done)
 LIB += $(LIB_BUILTINS)
@@ -181,10 +185,10 @@ endif
 # Libraries
 #
 ifneq (,$(findstring mingw32,$(SYS)))
-LIB += -lws2_32 -lnetapi32 -lmsvcrt40
+LIB += -lws2_32 -lnetapi32
 endif
 
-LIB += -L/usr/local/lib @LIB@
+LIB += @LIB@
 
 #
 # C compiler flags: mainstream compilation
@@ -259,7 +263,13 @@ DCFLAGS += -MM
 #
 LCFLAGS += @LCFLAGS@ $(LIB)
 LCFLAGS += -Wall
+ifneq ($(DEBUG),1)
+ifneq ($(GPROF),1)
+ifneq ($(CPROF),1)
 #LCFLAGS += -s
+endif
+endif
+endif
 ifneq (,$(findstring mingw32,$(SYS)))
 LCFLAGS += -mwindows -Xlinker --force-exe-suffix
 endif
@@ -267,7 +277,7 @@ endif
 #
 # C compiler and linker flags: setting soname
 #
-SOFLAGS += @SOFLAGS@
+SOFLAGS = @SOFLAGS@
 
 #
 # C compiler flags: plugin compilation