* ./bootstrap : Fixed an issue with old shell versions

[vlc] / Makefile.opts.in

diff --git a/Makefile.opts.in b/Makefile.opts.in
index 6ee02a8331719b239c922609e52aada23e24ccb5..2b8552e729acaab07455ebc27adfb5f6e027aea2 100644 (file)
--- a/Makefile.opts.in
+++ b/Makefile.opts.in
@@ -14,6 +14,7 @@ HAVE_MAKEFILE_OPTS = 1
 # 
 SYS = @SYS@
 ALIASES =@ALIASES@
+MOZILLA = @MOZILLA@
 INSTALL = @INSTALL@
 ARCH = @ARCH@
 
@@ -31,7 +32,7 @@ RELEASE = @RELEASE@
 # Build environment
 # 
 CC = @CC@
-CFLAGS = @CFLAGS@
+CFLAGS += @CFLAGS@
 SHELL = @SHELL@
 RANLIB = @RANLIB@
 STRIP = @STRIP@
@@ -53,27 +54,35 @@ 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@
+faad_CFLAGS = @faad_CFLAGS@
 ffmpeg_CFLAGS = @ffmpeg_CFLAGS@
 glide_CFLAGS = @glide_CFLAGS@
 gnome_CFLAGS = @gnome_CFLAGS@
 gtk_CFLAGS = @gtk_CFLAGS@
-kde_CFLAGS = @kde_CFLAGS@
+gtk_main_CFLAGS = @gtk_main_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@
+qte_CFLAGS = @qte_CFLAGS@
 sdl_CFLAGS = @sdl_CFLAGS@
+svgalib_CFLAGS = @svgalib_CFLAGS@
 x11_CFLAGS = @x11_CFLAGS@
 xvideo_CFLAGS = @xvideo_CFLAGS@
 
@@ -81,27 +90,33 @@ 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@
+dv_LDFLAGS = @dv_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@
+faad_LDFLAGS = @faad_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@
+gtk_main_LDFLAGS = @gtk_main_LDFLAGS@
+http_LDFLAGS = @http_LDFLAGS@
 idctaltivec_LDFLAGS = @idctaltivec_LDFLAGS@
 imdct_LDFLAGS = @imdct_LDFLAGS@
 imdct3dn_LDFLAGS = @imdct3dn_LDFLAGS@
@@ -115,15 +130,22 @@ mad_LDFLAGS = @mad_LDFLAGS@
 memcpyaltivec_LDFLAGS = @memcpyaltivec_LDFLAGS@
 motionaltivec_LDFLAGS = @motionaltivec_LDFLAGS@
 ncurses_LDFLAGS = @ncurses_LDFLAGS@
+oss_LDFLAGS = @oss_LDFLAGS@
 qnx_LDFLAGS = @qnx_LDFLAGS@
 qt_LDFLAGS = @qt_LDFLAGS@
+qte_LDFLAGS = @qte_LDFLAGS@
 rc_LDFLAGS = @rc_LDFLAGS@
 sdl_LDFLAGS = @sdl_LDFLAGS@
+svgalib_LDFLAGS = @svgalib_LDFLAGS@
+audio_LDFLAGS = @audio_LDFLAGS@
+ts_dvbpsi_LDFLAGS = @ts_dvbpsi_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@
+id3tag_LDFLAGS = @id3tag_LDFLAGS@
 
 #
 # Other special cases
@@ -166,8 +188,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
@@ -177,18 +199,20 @@ CFLAGS += -DPLUGIN_PATH=\"@prefix@/lib/videolan/vlc\"
 #
 # C headers directories
 #
-CFLAGS += -Iinclude -Iextras
+vlc_CFLAGS += -Iinclude -Iextras -I.
 
 #
 # 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@
@@ -237,17 +261,10 @@ endif
 endif
 endif
 
-#
-# C compiler flags: plugins and builtins compilation
-#
-vlc_CFLAGS += -D__VLC__
-plugins_CFLAGS += -D__VLC__ -D__PLUGIN__ -I../../include -I../../extras
-builtins_CFLAGS += -D__VLC__ -D__BUILTIN__ -I../../include -I../../extras
-
 #
 # Linker flags: plugins and builtins linking
 #
-builtins_LDFLAGS += $(patsubst %,$$%_LDFLAGS,$(BUILTINS))
+builtins_LDFLAGS += $(shell echo $(BUILTINS) | sed -e 's@[^ ]*/\([^ ]*\)@$$\1_LDFLAGS@g')
 
 #
 # Debugging and profiling support