* ./src/misc/modules.c: if a module name starts with "$", vlc calls

[vlc] / Makefile.opts.in

diff --git a/Makefile.opts.in b/Makefile.opts.in
index 1ec4d318b0498298ec16c54631c772726fd7bfa2..768ed80be8c0ae360fc1a95ea87ef61712c7fb60 100644 (file)
--- 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@
 
@@ -67,25 +54,29 @@ includedir = @includedir@
 # CFLAGS for special cases
 #
 vlc_CFLAGS = @vlc_CFLAGS@
-plugins_CFLAGS := @plugins_CFLAGS@
-builtins_CFLAGS := @builtins_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@
-mpeg_ts_dvbpsi_CFLAGS = @mpeg_ts_dvbpsi_CFLAGS@
-directx_CFLAGS = @directx_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@
-kde_CFLAGS = @kde_CFLAGS@
 idctaltivec_CFLAGS = @idctaltivec_CFLAGS@
-macosx_CFLAGS = @macosx_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@
@@ -95,38 +86,44 @@ xvideo_CFLAGS = @xvideo_CFLAGS@
 # Libraries for special cases
 #
 vlc_LDFLAGS = @vlc_LDFLAGS@
-plugins_LDFLAGS += @plugins_LDFLAGS@
-builtins_LDFLAGS += @builtins_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@
-chroma_i420_rgb_LDFLAGS = @chroma_i420_rgb_LDFLAGS@
+i420_rgb_LDFLAGS = @i420_rgb_LDFLAGS@
 directx_LDFLAGS = @directx_LDFLAGS@
 dsp_LDFLAGS = @dsp_LDFLAGS@
 dvd_LDFLAGS = @dvd_LDFLAGS@
 dvdread_LDFLAGS = @dvdread_LDFLAGS@
-mpeg_ts_dvbpsi_LDFLAGS = @mpeg_ts_dvbpsi_LDFLAGS@
+dvdplay_LDFLAGS = @dvdplay_LDFLAGS@
 esd_LDFLAGS = @esd_LDFLAGS@
-filter_distort_LDFLAGS = @filter_distort_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@
@@ -136,6 +133,7 @@ vcd_LDFLAGS = @vcd_LDFLAGS@
 vorbis_LDFLAGS = @vorbis_LDFLAGS@
 waveout_LDFLAGS = @waveout_LDFLAGS@
 x11_LDFLAGS = @x11_LDFLAGS@
+xosd_LDFLAGS = @xosd_LDFLAGS@
 xvideo_LDFLAGS = @xvideo_LDFLAGS@
 
 #
@@ -179,8 +177,8 @@ CFLAGS += -D_FILE_OFFSET_BITS=64 -D__USE_UNIX98 -D_LARGEFILE64_SOURCE
 CFLAGS += -DLOCALEDIR=\"$(datadir)/locale\"
 
 # Data and plugin location
-CFLAGS += -DDATA_PATH=\"@prefix@/share/videolan\"
-CFLAGS += -DPLUGIN_PATH=\"@prefix@/lib/videolan/vlc\"
+CFLAGS += -DDATA_PATH=\"@prefix@/share/vlc\"
+CFLAGS += -DPLUGIN_PATH=\"@prefix@/lib/vlc\"
 
 ###############################################################################
 # Tuning and other variables - do not change anything except if you know
@@ -195,13 +193,15 @@ CFLAGS += -Iinclude -Iextras
 #
 # C compiler flags: mainstream compilation
 #
-CFLAGS += -D_REENTRANT
+CFLAGS += -D_REENTRANT -D_THREAD_SAFE
 CFLAGS += -D_GNU_SOURCE
 
 ifeq ($(RELEASE),1)
 CFLAGS += -DHAVE_RELEASE
 endif
 
+CFLAGS += -D__VLC__
+
 # Optimizations : don't compile debug versions with them
 ifeq ($(OPTIMS),1)
 CFLAGS += @CFLAGS_OPTIM@
@@ -250,17 +250,10 @@ endif
 endif
 endif
 
-#
-# C compiler flags: plugins and builtins compilation
-#
-vlc_CFLAGS += -D__VLC__
-plugins_CFLAGS += -D__PLUGIN__ -I../../include -I../../extras
-builtins_CFLAGS += -D__BUILTIN__ -I../../include -I../../extras
-
 #
 # Linker flags: plugins and builtins linking
 #
-builtins_LDFLAGS += $(patsubst %,$$%_LDFLAGS,$(BUILTINS))
+builtins_LDFLAGS += $(patsubst %,$$%_LDFLAGS,$(shell echo $(BUILTINS) | sed -e 's@\([^ ]*/\)*@@g'))
 
 #
 # Debugging and profiling support