X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.opts.in;h=cbb703b551b8291f211a45fffd5ba997d2dab567;hb=71b4ea0ba477e11ea53f91fa246f9d1163ef7029;hp=b630bf55e8a743e43869f4de18c333d303788e7f;hpb=332c81bba051edf3be76deaed6d891113d6adef1;p=vlc

diff --git a/Makefile.opts.in b/Makefile.opts.in
index b630bf55e8..cbb703b551 100644
--- a/Makefile.opts.in
+++ b/Makefile.opts.in
@@ -3,6 +3,8 @@
 # (c)1998 VideoLAN
 ###############################################################################
 
+HAVE_MAKEFILE_OPTS = 1
+
 ###############################################################################
 # Configuration
 ###############################################################################
@@ -33,11 +35,11 @@ ARCH = @ARCH@
 # Compilation options
 #
 DEBUG = @DEBUG@
-STATS = @STATS@
-TRACE = @TRACE@
-PROFILING = @PROFILING@
+CPROF = @CPROF@
+GPROF = @GPROF@
 OPTIMS = @OPTIMS@
-GETOPT = @GETOPT@
+TUNING = @TUNING@
+RELEASE = @RELEASE@
 
 # 
 # Build environment
@@ -48,6 +50,7 @@ SHELL = @SHELL@
 RANLIB = @RANLIB@
 WINDRES = @WINDRES@
 MOC = @MOC@
+DLL_PATH = @DLL_PATH@
 
 # 
 # Installation environment
@@ -62,40 +65,80 @@ 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_DVDREAD = @LIB_DVDREAD@
 LIB_ESD = @LIB_ESD@
+LIB_FILTER_DISTORT = @LIB_FILTER_DISTORT@
 LIB_GGI = @LIB_GGI@
 LIB_GLIDE = @LIB_GLIDE@
 LIB_GNOME = @LIB_GNOME@
 LIB_GTK = @LIB_GTK@
 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_LIRC = @LIB_LIRC@
 LIB_MACOSX = @LIB_MACOSX@
-LIB_QNX = @LIB_QNX@
+LIB_MAD = @LIB_MAD@
+LIB_MEMCPYALTIVEC = @LIB_MEMCPYALTIVEC@
+LIB_MOTIONALTIVEC = @LIB_MOTIONALTIVEC@
+LIB_MPEG_TS = @LIB_MPEG_TS@
 LIB_NCURSES = @LIB_NCURSES@
+LIB_QNX = @LIB_QNX@
 LIB_QT = @LIB_QT@
-LIB_TS = @LIB_TS@
+LIB_RC = @LIB_RC@
 LIB_SDL = @LIB_SDL@
-LIB_DIRECTX = @LIB_DIRECTX@
+LIB_VCD = @LIB_VCD@
+LIB_VORBIS = @LIB_VORBIS@
+LIB_WAVEOUT = @LIB_WAVEOUT@
+LIB_WIN32 = @LIB_WIN32@
 LIB_X11 = @LIB_X11@
 LIB_XVIDEO = @LIB_XVIDEO@
-LIB_YUV = @LIB_YUV@
 
 #
 # CFLAGS for special cases
 #
+CFLAGS_COMMON = @CFLAGS_COMMON@
+CFLAGS_VLC = @CFLAGS_VLC@
+
+CFLAGS_ARTS = @CFLAGS_ARTS@
 CFLAGS_DVD = @CFLAGS_DVD@
+CFLAGS_DVDREAD = @CFLAGS_DVDREAD@
+CFLAGS_ESD = @CFLAGS_ESD@
+CFLAGS_GLIDE = @CFLAGS_GLIDE@
+CFLAGS_GNOME = @CFLAGS_GNOME@
 CFLAGS_GTK = @CFLAGS_GTK@
+CFLAGS_KDE = @CFLAGS_KDE@
+CFLAGS_IDCTALTIVEC = @CFLAGS_IDCTALTIVEC@
+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@
 
 #
 # Other special cases
 #
-LOCAL_LIBDVDCSS = @LOCAL_LIBDVDCSS@
+NEED_GETOPT = @NEED_GETOPT@
 
 ###############################################################################
 # Configuration pre-processing
@@ -107,17 +150,13 @@ ifeq ($(DEBUG),1)
 PROGRAM_OPTIONS += DEBUG
 DEFINE += -DDEBUG
 endif
-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 ($(STATS),1)
-PROGRAM_OPTIONS += STATS
-DEFINE += -DSTATS
+ifeq ($(GPROF),1)
+PROGRAM_OPTIONS += GPROF
+DEFINE += -DGPROF
 endif
 
 # PROGRAM_BUILD is a complete identification of the build
@@ -130,19 +169,20 @@ 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_CONSTANTS := -DSYS_$(shell echo $(SYS) | sed -e 's/-.*//' | tr '[a-z].' '[A-Z]_')
-DEFINE += $(DEFINE_CONSTANTS)
+DEFINE_SYS := -DSYS_$(shell echo $(SYS) | sed -e 's/-.*//' | tr '[a-z].' '[A-Z]_')
+DEFINE += $(DEFINE_SYS)
 
-# On Linux activate 64-bit off_t (by default under BSD)
-ifneq (,$(findstring linux,$(SYS)))
-DEFINE += -D_FILE_OFFSET_BITS=64 -D__USE_UNIX98
-endif
+# On Linux and Solaris, activate 64-bit off_t (by default under BSD)
+DEFINE += -D_FILE_OFFSET_BITS=64 -D__USE_UNIX98 -D_LARGEFILE64_SOURCE
+
+# Gettext support
+DEFINE += -DLOCALEDIR=\"$(datadir)/locale\"
+
+# Data and plugin location
+DEFINE += -DDATA_PATH=\"@prefix@/share/videolan\"
+DEFINE += -DPLUGIN_PATH=\"@prefix@/lib/videolan/vlc\"
 
 ###############################################################################
 # Tuning and other variables - do not change anything except if you know
@@ -153,48 +193,38 @@ endif
 # C headers directories
 #
 INCLUDE += @INCLUDE@
-INCLUDE += -Iinclude -Iextras -I/usr/local/include
+INCLUDE += -Iinclude -Iextras
 
 #
 # Libraries needed by built-in modules
 #
-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)
-endif
+LIB_BUILTINS := $(patsubst %,$$LIB_%,$(shell echo $(BUILTINS) | tr '[a-z]' '[A-Z]'))
 
 #
-# Libraries
+# Libraries needed by the vlc executable
 #
-ifeq (1,$(LOCAL_LIBDVDCSS))
-ifneq (,$(findstring dvd,$(BUILTINS)))
-LIB += lib/libdvdcss.a
-endif
-endif
-
 ifneq (,$(findstring mingw32,$(SYS)))
-LIB += -lws2_32 -lnetapi32
+LIB_VLC += -lws2_32 -lnetapi32
 endif
 
-LIB += -L/usr/local/lib @LIB@
-
 #
 # C compiler flags: mainstream compilation
 #
-DEFINE += @DEFINE@
 CFLAGS += $(DEFINE) $(INCLUDE)
-CFLAGS += -Wall -Winline
-CFLAGS += -pipe
 CFLAGS += -D_REENTRANT
 CFLAGS += -D_GNU_SOURCE
 
+ifeq ($(RELEASE),1)
+CFLAGS += -DHAVE_RELEASE
+endif
+
 # flags needed for clean beos compilation
 ifeq ($(SYS),beos)
 CFLAGS += -Wno-multichar -Wno-ctor-dtor-privacy -Woverloaded-virtual
 endif
 
 ifneq (,$(findstring darwin,$(SYS)))
-CFLAGS += -traditional-cpp
+CFLAGS += -no-cpp-precomp
 endif
 
 ifneq (,$(findstring mingw32,$(SYS)))
@@ -207,32 +237,34 @@ 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 ($(PROFILING),1)
-CFLAGS += -fomit-frame-pointer
+ifneq ($(GPROF),1)
+ifneq ($(CPROF),1)
+CFLAGS += @CFLAGS_OPTIM_NODEBUG@
 endif
 endif
-
-# Optimizations for x86 familiy
-ifneq (,$(findstring 86,$(ARCH)))
-# Optional Pentium Pro optimizations
-ifneq (,$(findstring ppro,$(ARCH)))
-CFLAGS += -march=pentiumpro -mcpu=pentiumpro
-else
-CFLAGS += -march=pentium -mcpu=pentium
-endif
 endif
 
-# Optimizations for PowerPC
 ifneq (,$(findstring powerpc,$(ARCH)))
-CFLAGS += -mmultiple -mhard-float -mstring
+# Optimizations for PowerPC
+CFLAGS += -mmultiple -mhard-float -mstring -mcpu=powerpc
+ifneq (,$(TUNING))
+CFLAGS += -mtune=$(TUNING)
 endif
-
-# Optimizations for Sparc
+else
 ifneq (,$(findstring sparc,$(ARCH)))
+# Optimizations for Sparc
 CFLAGS += -mhard-float
+ifneq (,$(TUNING))
+CFLAGS += -mcpu=$(TUNING)
+endif
+else
+# Generic optimizations
+ifneq (,$(TUNING))
+CFLAGS += -mcpu=$(TUNING)
+endif
+endif
 endif
 
 #end of optimisations
@@ -242,16 +274,23 @@ endif
 # C compiler flags: dependancies
 #
 DCFLAGS += $(INCLUDE)
-DCFLAGS += -MM
+DCFLAGS += -M
 
 #
 # C compiler flags: linking
 #
-LCFLAGS += @LCFLAGS@ $(LIB)
-LCFLAGS += -Wall
-#LCFLAGS += -s
+LDFLAGS += @LDFLAGS@
+LDFLAGS += $(LIB)
+LDFLAGS += -Wall
+ifneq ($(DEBUG),1)
+ifneq ($(GPROF),1)
+ifneq ($(CPROF),1)
+#LDFLAGS += -s
+endif
+endif
+endif
 ifneq (,$(findstring mingw32,$(SYS)))
-LCFLAGS += -mwindows -Xlinker --force-exe-suffix
+LDFLAGS += -mwindows -Xlinker --force-exe-suffix
 endif
 
 #
@@ -266,7 +305,7 @@ endif
 #
 # C compiler flags: plugin linking
 #
-PLCFLAGS += @PLCFLAGS@
+PLDFLAGS += @PLDFLAGS@
 
 #
 # Debugging and profiling support
@@ -275,7 +314,12 @@ ifeq ($(DEBUG),1)
 CFLAGS += -g
 endif
 
-ifeq ($(PROFILING),1)
+ifeq ($(CPROF),1)
+CFLAGS += -finstrument-functions
+endif
+
+ifeq ($(GPROF),1)
 CFLAGS += -pg
 endif
 
+