X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.opts.in;h=768ed80be8c0ae360fc1a95ea87ef61712c7fb60;hb=d860bddfc2c3abea5bfb3cffe0a65ed91863c27e;hp=af8cf8cad3cee5ec79943ee3fc2e8e8974af64b3;hpb=6cd676bcf981a014a5237bb42add647ddc90cdaf;p=vlc

diff --git a/Makefile.opts.in b/Makefile.opts.in
index af8cf8cad3..768ed80be8 100644
--- a/Makefile.opts.in
+++ b/Makefile.opts.in
@@ -10,24 +10,11 @@ HAVE_MAKEFILE_OPTS = 1
 ###############################################################################
 
 # 
-# Plugins to build
-# WARNING: if you do not have a dynamic loader on your platform, remove
-# the plugins in this line and put them as built-ins, otherwise your
-# application won't be able to load them.
-# 
-PLUGINS :=@PLUGINS@
-
-# 
-# Built-in modules to build
-# WARNING: do NOT put gtk and gnome together in this rule.
-# 
-BUILTINS :=@BUILTINS@
-
-# 
-# Additional build options
+# Build options
 # 
 SYS = @SYS@
 ALIASES =@ALIASES@
+MOZILLA = @MOZILLA@
 INSTALL = @INSTALL@
 ARCH = @ARCH@
 
@@ -35,10 +22,11 @@ ARCH = @ARCH@
 # Compilation options
 #
 DEBUG = @DEBUG@
-TRACE = @TRACE@
 CPROF = @CPROF@
 GPROF = @GPROF@
 OPTIMS = @OPTIMS@
+TUNING = @TUNING@
+RELEASE = @RELEASE@
 
 # 
 # Build environment
@@ -47,8 +35,10 @@ CC = @CC@
 CFLAGS = @CFLAGS@
 SHELL = @SHELL@
 RANLIB = @RANLIB@
-WINDRES = @WINDRES@
+STRIP = @STRIP@
 MOC = @MOC@
+WINDRES = @WINDRES@
+BCBUILDER = @BCBUILDER@
 
 # 
 # Installation environment
@@ -60,54 +50,96 @@ datadir = @datadir@
 libdir = @libdir@
 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_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@
-LIB_SDL = @LIB_SDL@
-LIB_DIRECTX = @LIB_DIRECTX@
-LIB_X11 = @LIB_X11@
-LIB_XVIDEO = @LIB_XVIDEO@
-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@
+vlc_CFLAGS = @vlc_CFLAGS@
+plugins_CFLAGS = @plugins_CFLAGS@
+builtins_CFLAGS = @builtins_CFLAGS@
+mozilla_CFLAGS = @mozilla_CFLAGS@
+
+a52_CFLAGS = @a52_CFLAGS@
+arts_CFLAGS = @arts_CFLAGS@
+i420_yuy2_mmx_CFLAGS = @i420_yuy2_mmx_CFLAGS@
+directx_CFLAGS = @directx_CFLAGS@
+dvd_CFLAGS = @dvd_CFLAGS@
+dvdread_CFLAGS = @dvdread_CFLAGS@
+dvdplay_CFLAGS = @dvdplay_CFLAGS@
+esd_CFLAGS = @esd_CFLAGS@
+familiar_CFLAGS = @familiar_CFLAGS@
+ffmpeg_CFLAGS = @ffmpeg_CFLAGS@
+glide_CFLAGS = @glide_CFLAGS@
+gnome_CFLAGS = @gnome_CFLAGS@
+gtk_CFLAGS = @gtk_CFLAGS@
+idctaltivec_CFLAGS = @idctaltivec_CFLAGS@
+kde_CFLAGS = @kde_CFLAGS@
+mad_CFLAGS = @mad_CFLAGS@
+memcpyaltivec_CFLAGS = @memcpyaltivec_CFLAGS@
+motionaltivec_CFLAGS = @motionaltivec_CFLAGS@
+ts_dvbpsi_CFLAGS = @ts_dvbpsi_CFLAGS@
+qt_CFLAGS = @qt_CFLAGS@
+sdl_CFLAGS = @sdl_CFLAGS@
+x11_CFLAGS = @x11_CFLAGS@
+xvideo_CFLAGS = @xvideo_CFLAGS@
 
 #
-# Additional objects
+# Libraries for special cases
 #
-OBJ_DVD = @OBJ_DVD@
-OBJ_LIBDVDCSS = @OBJ_LIBDVDCSS@
+vlc_LDFLAGS = @vlc_LDFLAGS@
+plugins_LDFLAGS = @plugins_LDFLAGS@
+builtins_LDFLAGS = @builtins_LDFLAGS@
+mozilla_LDFLAGS = @mozilla_LDFLAGS@
+
+a52_LDFLAGS = @a52_LDFLAGS@
+aa_LDFLAGS = @aa_LDFLAGS@
+alsa_LDFLAGS = @alsa_LDFLAGS@
+arts_LDFLAGS = @arts_LDFLAGS@
+beos_LDFLAGS = @beos_LDFLAGS@
+i420_rgb_LDFLAGS = @i420_rgb_LDFLAGS@
+directx_LDFLAGS = @directx_LDFLAGS@
+dsp_LDFLAGS = @dsp_LDFLAGS@
+dvd_LDFLAGS = @dvd_LDFLAGS@
+dvdread_LDFLAGS = @dvdread_LDFLAGS@
+dvdplay_LDFLAGS = @dvdplay_LDFLAGS@
+esd_LDFLAGS = @esd_LDFLAGS@
+familiar_LDFLAGS = @familiar_LDFLAGS@
+distort_LDFLAGS = @distort_LDFLAGS@
+ffmpeg_LDFLAGS = @ffmpeg_LDFLAGS@
+mp4_LDFLAGS = @mp4_LDFLAGS@
+ggi_LDFLAGS = @ggi_LDFLAGS@
+glide_LDFLAGS = @glide_LDFLAGS@
+gnome_LDFLAGS = @gnome_LDFLAGS@
+gtk_LDFLAGS = @gtk_LDFLAGS@
+http_LDFLAGS = @http_LDFLAGS@
+idctaltivec_LDFLAGS = @idctaltivec_LDFLAGS@
+imdct_LDFLAGS = @imdct_LDFLAGS@
+imdct3dn_LDFLAGS = @imdct3dn_LDFLAGS@
+imdctsse_LDFLAGS = @imdctsse_LDFLAGS@
+ipv4_LDFLAGS = @ipv4_LDFLAGS@
+ipv6_LDFLAGS = @ipv6_LDFLAGS@
+kde_LDFLAGS = @kde_LDFLAGS@
+lirc_LDFLAGS = @lirc_LDFLAGS@
+macosx_LDFLAGS = @macosx_LDFLAGS@
+mad_LDFLAGS = @mad_LDFLAGS@
+memcpyaltivec_LDFLAGS = @memcpyaltivec_LDFLAGS@
+motionaltivec_LDFLAGS = @motionaltivec_LDFLAGS@
+ts_dvbpsi_LDFLAGS = @ts_dvbpsi_LDFLAGS@
+ncurses_LDFLAGS = @ncurses_LDFLAGS@
+qnx_LDFLAGS = @qnx_LDFLAGS@
+qt_LDFLAGS = @qt_LDFLAGS@
+rc_LDFLAGS = @rc_LDFLAGS@
+sdl_LDFLAGS = @sdl_LDFLAGS@
+vcd_LDFLAGS = @vcd_LDFLAGS@
+vorbis_LDFLAGS = @vorbis_LDFLAGS@
+waveout_LDFLAGS = @waveout_LDFLAGS@
+x11_LDFLAGS = @x11_LDFLAGS@
+xosd_LDFLAGS = @xosd_LDFLAGS@
+xvideo_LDFLAGS = @xvideo_LDFLAGS@
 
 #
 # Other special cases
 #
 NEED_GETOPT = @NEED_GETOPT@
-NEED_LIBDVDCSS = @NEED_LIBDVDCSS@
 
 ###############################################################################
 # Configuration pre-processing
@@ -117,19 +149,15 @@ NEED_LIBDVDCSS = @NEED_LIBDVDCSS@
 PROGRAM_OPTIONS = $(SYS) $(ARCH)
 ifeq ($(DEBUG),1)
 PROGRAM_OPTIONS += DEBUG
-DEFINE += -DDEBUG
-endif
-ifeq ($(TRACE),1)
-PROGRAM_OPTIONS += TRACE
-DEFINE += -DTRACE
+CFLAGS += -DDEBUG
 endif
 ifeq ($(CPROF),1)
 PROGRAM_OPTIONS += CPROF
-DEFINE += -DCPROF
+CFLAGS += -DCPROF
 endif
 ifeq ($(GPROF),1)
 PROGRAM_OPTIONS += GPROF
-DEFINE += -DGPROF
+CFLAGS += -DGPROF
 endif
 
 # PROGRAM_BUILD is a complete identification of the build
@@ -142,17 +170,15 @@ else
 PROGRAM_BUILD = `date` $(USER)@`hostname`
 endif
 
-# PROGRAM_VERSION is the current vlc version
-PROGRAM_VERSION=@VLC_VERSION@
-LIBDVDCSS_VERSION=@LIBDVDCSS_VERSION@
+# On Linux and Solaris, activate 64-bit off_t (by default under BSD)
+CFLAGS += -D_FILE_OFFSET_BITS=64 -D__USE_UNIX98 -D_LARGEFILE64_SOURCE
 
-# 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)
+# Gettext support
+CFLAGS += -DLOCALEDIR=\"$(datadir)/locale\"
 
-# On Linux and Solaris, activate 64-bit off_t (by default under BSD)
-DEFINE += -D_FILE_OFFSET_BITS=64 -D__USE_UNIX98
+# Data and plugin location
+CFLAGS += -DDATA_PATH=\"@prefix@/share/vlc\"
+CFLAGS += -DPLUGIN_PATH=\"@prefix@/lib/vlc\"
 
 ###############################################################################
 # Tuning and other variables - do not change anything except if you know
@@ -162,131 +188,72 @@ DEFINE += -D_FILE_OFFSET_BITS=64 -D__USE_UNIX98
 #
 # C headers directories
 #
-INCLUDE += @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)
-endif
-
-#
-# Libraries
-#
-ifneq (,$(findstring mingw32,$(SYS)))
-LIB += -lws2_32 -lnetapi32
-endif
-
-LIB += @LIB@
+CFLAGS += -Iinclude -Iextras
 
 #
 # C compiler flags: mainstream compilation
 #
-DEFINE += @DEFINE@
-CFLAGS += $(DEFINE) $(INCLUDE)
-CFLAGS += -Wall -Winline
-CFLAGS += -pipe
-CFLAGS += -D_REENTRANT
+CFLAGS += -D_REENTRANT -D_THREAD_SAFE
 CFLAGS += -D_GNU_SOURCE
 
-# flags needed for clean beos compilation
-ifeq ($(SYS),beos)
-CFLAGS += -Wno-multichar -Wno-ctor-dtor-privacy -Woverloaded-virtual
+ifeq ($(RELEASE),1)
+CFLAGS += -DHAVE_RELEASE
 endif
 
-ifneq (,$(findstring darwin,$(SYS)))
-CFLAGS += -traditional-cpp
-endif
-
-ifneq (,$(findstring mingw32,$(SYS)))
-CFLAGS += -fnative-struct -D_OFF_T_ -D_off_t=long
-endif
-
-ifneq (,$(findstring bsd,$(SYS)))
-CFLAGS += -pthread
-endif
+CFLAGS += -D__VLC__
 
 # 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
 
-# Optimizations for x86 familiy
-ifneq (,$(findstring 86,$(ARCH)))
-# Optional Pentium Pro optimizations
-ifneq (,$(findstring ppro,$(ARCH)))
-CFLAGS += -mcpu=pentiumpro
-else
-CFLAGS += -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
 endif
 
-#
-# C compiler flags: dependancies
-#
-DCFLAGS += $(INCLUDE)
-DCFLAGS += -MM
-
 #
 # C compiler flags: linking
 #
-LCFLAGS += @LCFLAGS@ $(LIB)
-LCFLAGS += -Wall
+LDFLAGS += @LDFLAGS@
+LDFLAGS += -Wall
 ifneq ($(DEBUG),1)
 ifneq ($(GPROF),1)
 ifneq ($(CPROF),1)
-#LCFLAGS += -s
-endif
-endif
+#LDFLAGS += -s
 endif
-ifneq (,$(findstring mingw32,$(SYS)))
-LCFLAGS += -mwindows -Xlinker --force-exe-suffix
 endif
-
-#
-# C compiler and linker flags: setting soname
-#
-SOFLAGS = @SOFLAGS@
-
-#
-# C compiler flags: plugin compilation
-#
-ifneq (,$(findstring mingw32,$(SYS)))
-PCFLAGS += -fnative-struct
-else
-PCFLAGS += -fPIC
 endif
 
 #
-# C compiler flags: plugin linking
+# Linker flags: plugins and builtins linking
 #
-PLCFLAGS += @PLCFLAGS@
+builtins_LDFLAGS += $(patsubst %,$$%_LDFLAGS,$(shell echo $(BUILTINS) | sed -e 's@\([^ ]*/\)*@@g'))
 
 #
 # Debugging and profiling support