"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 59ac553e8e18789dce92a069c738645cf58e5da6..ff60ce25f531877ef0b4e32b43198c50cfc32bb8 100644 (file)
--- a/Makefile.opts.in
+++ b/Makefile.opts.in
@@ -3,6 +3,8 @@
 # (c)1998 VideoLAN
 ###############################################################################
 
+HAVE_MAKEFILE_OPTS = 1
+
 ###############################################################################
 # Configuration
 ###############################################################################
@@ -35,9 +37,9 @@ ARCH = @ARCH@
 DEBUG = @DEBUG@
 STATS = @STATS@
 TRACE = @TRACE@
-PROFILING = @PROFILING@
+CPROF = @CPROF@
+GPROF = @GPROF@
 OPTIMS = @OPTIMS@
-GETOPT = @GETOPT@
 
 # 
 # Build environment
@@ -46,6 +48,7 @@ CC = @CC@
 CFLAGS = @CFLAGS@
 SHELL = @SHELL@
 RANLIB = @RANLIB@
+WINDRES = @WINDRES@
 MOC = @MOC@
 
 # 
@@ -62,16 +65,20 @@ 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@
+LIB_DVD_PLUGIN = @LIB_DVD_PLUGIN@
 LIB_ESD = @LIB_ESD@
 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@
+LIB_QNX = @LIB_QNX@
 LIB_NCURSES = @LIB_NCURSES@
 LIB_QT = @LIB_QT@
 LIB_TS = @LIB_TS@
@@ -84,15 +91,24 @@ LIB_YUV = @LIB_YUV@
 #
 # CFLAGS for special cases
 #
+CFLAGS_ALTIVEC = @CFLAGS_ALTIVEC@
 CFLAGS_DVD = @CFLAGS_DVD@
+CFLAGS_LIBDVDCSS = @CFLAGS_LIBDVDCSS@
 CFLAGS_GTK = @CFLAGS_GTK@
 CFLAGS_SDL = @CFLAGS_SDL@
 CFLAGS_X11 = @CFLAGS_X11@
 
+#
+# Additional objects
+#
+OBJ_DVD = @OBJ_DVD@
+OBJ_LIBDVDCSS = @OBJ_LIBDVDCSS@
+
 #
 # Other special cases
 #
-LOCAL_LIBDVDCSS = @LOCAL_LIBDVDCSS@
+NEED_GETOPT = @NEED_GETOPT@
+NEED_LIBDVDCSS = @NEED_LIBDVDCSS@
 
 ###############################################################################
 # Configuration pre-processing
@@ -108,9 +124,13 @@ ifeq ($(TRACE),1)
 PROGRAM_OPTIONS += TRACE
 DEFINE += -DTRACE
 endif
-ifeq ($(PROFILING),1)
-PROGRAM_OPTIONS += PROFILING
-DEFINE += -DPROFILING
+ifeq ($(CPROF),1)
+PROGRAM_OPTIONS += CPROF
+DEFINE += -DCPROF
+endif
+ifeq ($(GPROF),1)
+PROGRAM_OPTIONS += GPROF
+DEFINE += -DGPROF
 endif
 ifeq ($(STATS),1)
 PROGRAM_OPTIONS += STATS
@@ -129,16 +149,15 @@ endif
 
 # PROGRAM_VERSION is the current vlc version
 PROGRAM_VERSION=@VLC_VERSION@
+LIBDVDCSS_VERSION=@LIBDVDCSS_VERSION@
 
 # DEFINE will contain some of the constants definitions decided in Makefile, 
 # including SYS_xx. It will be passed to C compiler.
 DEFINE_CONSTANTS := -DSYS_$(shell echo $(SYS) | sed -e 's/-.*//' | tr '[a-z].' '[A-Z]_')
 DEFINE += $(DEFINE_CONSTANTS)
 
-# On Linux activate 64-bit off_t (by default under BSD)
-ifneq (,$(findstring linux,$(SYS)))
+# On Linux and Solaris, activate 64-bit off_t (by default under BSD)
 DEFINE += -D_FILE_OFFSET_BITS=64 -D__USE_UNIX98
-endif
 
 ###############################################################################
 # Tuning and other variables - do not change anything except if you know
@@ -149,11 +168,14 @@ endif
 # 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)
@@ -162,17 +184,11 @@ endif
 #
 # Libraries
 #
-ifeq (1,$(LOCAL_LIBDVDCSS))
-ifneq (,$(findstring dvd,$(BUILTINS)))
-LIB += lib/libdvdcss.a
-endif
-endif
-
 ifneq (,$(findstring mingw32,$(SYS)))
 LIB += -lws2_32 -lnetapi32
 endif
 
-LIB += -L/usr/local/lib @LIB@
+LIB += @LIB@
 
 #
 # C compiler flags: mainstream compilation
@@ -180,6 +196,7 @@ LIB += -L/usr/local/lib @LIB@
 DEFINE += @DEFINE@
 CFLAGS += $(DEFINE) $(INCLUDE)
 CFLAGS += -Wall -Winline
+CFLAGS += -pipe
 CFLAGS += -D_REENTRANT
 CFLAGS += -D_GNU_SOURCE
 
@@ -193,7 +210,11 @@ CFLAGS += -traditional-cpp
 endif
 
 ifneq (,$(findstring mingw32,$(SYS)))
-CFLAGS += -fnative-struct
+CFLAGS += -fnative-struct -D_OFF_T_ -D_off_t=long
+endif
+
+ifneq (,$(findstring bsd,$(SYS)))
+CFLAGS += -pthread
 endif
 
 # Optimizations : don't compile debug versions with them
@@ -201,10 +222,12 @@ ifeq ($(OPTIMS),1)
 CFLAGS += -O3
 CFLAGS += -ffast-math -funroll-loops
 ifneq ($(DEBUG),1)
-ifneq ($(PROFILING),1)
+ifneq ($(GPROF),1)
+ifneq ($(CPROF),1)
 CFLAGS += -fomit-frame-pointer
 endif
 endif
+endif
 
 # Optimizations for x86 familiy
 ifneq (,$(findstring 86,$(ARCH)))
@@ -240,11 +263,22 @@ 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 += -Xlinker --force-exe-suffix
+LCFLAGS += -mwindows -Xlinker --force-exe-suffix
 endif
 
+#
+# C compiler and linker flags: setting soname
+#
+SOFLAGS = @SOFLAGS@
+
 #
 # C compiler flags: plugin compilation
 #
@@ -266,7 +300,12 @@ ifeq ($(DEBUG),1)
 CFLAGS += -g
 endif
 
-ifeq ($(PROFILING),1)
+ifeq ($(CPROF),1)
+CFLAGS += -finstrument-functions
+endif
+
+ifeq ($(GPROF),1)
 CFLAGS += -pg
 endif
 
+