* ./plugins/gtk/gtk.glade, plugins/gtk/gnome.glade, ./plugins/kde/kde.cpp:

[vlc] / Makefile.opts.in

diff --git a/Makefile.opts.in b/Makefile.opts.in
index 72afe40af2653fad93ce0b1bd985151fa9af436a..cbb703b551b8291f211a45fffd5ba997d2dab567 100644 (file)
--- a/Makefile.opts.in
+++ b/Makefile.opts.in
@@ -35,7 +35,6 @@ ARCH = @ARCH@
 # Compilation options
 #
 DEBUG = @DEBUG@
-TRACE = @TRACE@
 CPROF = @CPROF@
 GPROF = @GPROF@
 OPTIMS = @OPTIMS@
@@ -66,16 +65,20 @@ includedir = @includedir@
 #
 # Libraries for special cases
 #
+LIB_COMMON = @LIB_COMMON@
+LIB_VLC = @LIB_VLC@
+
+LIB_A52 = @LIB_A52@
+LIB_AA = @LIB_AA@
 LIB_ALSA = @LIB_ALSA@
 LIB_ARTS = @LIB_ARTS@
 LIB_BEOS = @LIB_BEOS@
+LIB_CHROMA_I420_RGB = @LIB_CHROMA_I420_RGB@
 LIB_DARWIN = @LIB_DARWIN@
 LIB_DIRECTX = @LIB_DIRECTX@
+LIB_DSP = @LIB_DSP@
 LIB_DVD = @LIB_DVD@
-LIB_DVD_PLUGIN = @LIB_DVD_PLUGIN@
-LIB_DVDREAD_PLUGIN = @LIB_DVDREAD_PLUGIN@
 LIB_DVDREAD = @LIB_DVDREAD@
-LIB_DVDREAD_PLUGIN = @LIB_DVDREAD_PLUGIN@
 LIB_ESD = @LIB_ESD@
 LIB_FILTER_DISTORT = @LIB_FILTER_DISTORT@
 LIB_GGI = @LIB_GGI@
@@ -86,10 +89,13 @@ LIB_IDCTALTIVEC = @LIB_IDCTALTIVEC@
 LIB_IMDCT = @LIB_IMDCT@
 LIB_IMDCT3DN = @LIB_IMDCT3DN@
 LIB_IMDCTSSE = @LIB_IMDCTSSE@
+LIB_IPV4 = @LIB_IPV4@
+LIB_IPV6 = @LIB_IPV6@
 LIB_KDE = @LIB_KDE@
-LIB_LIBDVDCSS = @LIB_LIBDVDCSS@
+LIB_LIRC = @LIB_LIRC@
 LIB_MACOSX = @LIB_MACOSX@
 LIB_MAD = @LIB_MAD@
+LIB_MEMCPYALTIVEC = @LIB_MEMCPYALTIVEC@
 LIB_MOTIONALTIVEC = @LIB_MOTIONALTIVEC@
 LIB_MPEG_TS = @LIB_MPEG_TS@
 LIB_NCURSES = @LIB_NCURSES@
@@ -97,13 +103,19 @@ LIB_QNX = @LIB_QNX@
 LIB_QT = @LIB_QT@
 LIB_RC = @LIB_RC@
 LIB_SDL = @LIB_SDL@
+LIB_VCD = @LIB_VCD@
+LIB_VORBIS = @LIB_VORBIS@
+LIB_WAVEOUT = @LIB_WAVEOUT@
+LIB_WIN32 = @LIB_WIN32@
 LIB_X11 = @LIB_X11@
 LIB_XVIDEO = @LIB_XVIDEO@
 
 #
 # CFLAGS for special cases
 #
+CFLAGS_COMMON = @CFLAGS_COMMON@
 CFLAGS_VLC = @CFLAGS_VLC@
+
 CFLAGS_ARTS = @CFLAGS_ARTS@
 CFLAGS_DVD = @CFLAGS_DVD@
 CFLAGS_DVDREAD = @CFLAGS_DVDREAD@
@@ -113,26 +125,20 @@ CFLAGS_GNOME = @CFLAGS_GNOME@
 CFLAGS_GTK = @CFLAGS_GTK@
 CFLAGS_KDE = @CFLAGS_KDE@
 CFLAGS_IDCTALTIVEC = @CFLAGS_IDCTALTIVEC@
-CFLAGS_LIBDVDCSS = @CFLAGS_LIBDVDCSS@
 CFLAGS_MACOSX = @CFLAGS_MACOSX@
 CFLAGS_MAD = @CFLAGS_MAD@
+CFLAGS_MEMCPYALTIVEC = @CFLAGS_MEMCPYALTIVEC@
 CFLAGS_MOTIONALTIVEC = @CFLAGS_MOTIONALTIVEC@
 CFLAGS_QT = @CFLAGS_QT@
 CFLAGS_SDL = @CFLAGS_SDL@
+CFLAGS_WIN32 = @CFLAGS_WIN32@
 CFLAGS_X11 = @CFLAGS_X11@
 CFLAGS_XVIDEO = @CFLAGS_XVIDEO@
 
-#
-# Additional objects
-#
-SRC_DVD_EXTRA = @SRC_DVD_EXTRA@
-SRC_DVDCSS_EXTRA = @SRC_DVDCSS_EXTRA@
-
 #
 # Other special cases
 #
 NEED_GETOPT = @NEED_GETOPT@
-NEED_LIBDVDCSS = @NEED_LIBDVDCSS@
 
 ###############################################################################
 # Configuration pre-processing
@@ -144,10 +150,6 @@ ifeq ($(DEBUG),1)
 PROGRAM_OPTIONS += DEBUG
 DEFINE += -DDEBUG
 endif
-ifeq ($(TRACE),1)
-PROGRAM_OPTIONS += TRACE
-DEFINE += -DTRACE
-endif
 ifeq ($(CPROF),1)
 PROGRAM_OPTIONS += CPROF
 DEFINE += -DCPROF
@@ -167,17 +169,13 @@ else
 PROGRAM_BUILD = `date` $(USER)@`hostname`
 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_SYS := -DSYS_$(shell echo $(SYS) | sed -e 's/-.*//' | tr '[a-z].' '[A-Z]_')
 DEFINE += $(DEFINE_SYS)
 
 # On Linux and Solaris, activate 64-bit off_t (by default under BSD)
-DEFINE += -D_FILE_OFFSET_BITS=64 -D__USE_UNIX98 
+DEFINE += -D_FILE_OFFSET_BITS=64 -D__USE_UNIX98 -D_LARGEFILE64_SOURCE
 
 # Gettext support
 DEFINE += -DLOCALEDIR=\"$(datadir)/locale\"
@@ -201,24 +199,18 @@ INCLUDE += -Iinclude -Iextras
 # Libraries needed by built-in modules
 #
 LIB_BUILTINS := $(patsubst %,$$LIB_%,$(shell echo $(BUILTINS) | tr '[a-z]' '[A-Z]'))
-LIB += $(LIB_BUILTINS)
 
 #
-# Libraries
+# Libraries needed by the vlc executable
 #
 ifneq (,$(findstring mingw32,$(SYS)))
-LIB += -lws2_32 -lnetapi32
+LIB_VLC += -lws2_32 -lnetapi32
 endif
 
-LIB += @LIB@
-
 #
 # C compiler flags: mainstream compilation
 #
-DEFINE += @DEFINE@
 CFLAGS += $(DEFINE) $(INCLUDE)
-CFLAGS += -Wall -Winline
-CFLAGS += -pipe
 CFLAGS += -D_REENTRANT
 CFLAGS += -D_GNU_SOURCE
 
@@ -245,12 +237,11 @@ endif
 
 # Optimizations : don't compile debug versions with them
 ifeq ($(OPTIMS),1)
-CFLAGS += -O3
-CFLAGS += -ffast-math -funroll-loops
+CFLAGS += @CFLAGS_OPTIM@
 ifneq ($(DEBUG),1)
 ifneq ($(GPROF),1)
 ifneq ($(CPROF),1)
-CFLAGS += -fomit-frame-pointer
+CFLAGS += @CFLAGS_OPTIM_NODEBUG@
 endif
 endif
 endif
@@ -283,7 +274,7 @@ endif
 # C compiler flags: dependancies
 #
 DCFLAGS += $(INCLUDE)
-DCFLAGS += -MM
+DCFLAGS += -M
 
 #
 # C compiler flags: linking
@@ -302,11 +293,6 @@ ifneq (,$(findstring mingw32,$(SYS)))
 LDFLAGS += -mwindows -Xlinker --force-exe-suffix
 endif
 
-#
-# C compiler and linker flags: setting soname
-#
-SOFLAGS = @SOFLAGS@
-
 #
 # C compiler flags: plugin compilation
 #