. should compile & run on Solaris with ./configure --disable-dsp

[vlc] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 6f12a0ec250c69f98d4f586d2285d1e220840dd8..c99e955b18b80e47a291dc470f910c98171f5171 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -23,6 +23,9 @@ prefix=@prefix@
 CC=@CC@
 SHELL=@SHELL@
 
+LIB_SDL=@LIB_SDL@
+LIB_GLIDE=@LIB_GLIDE@
+LIB_GGI=@LIB_GGI@
 
 #----------------- do not change anything below this line ----------------------
 
@@ -50,7 +53,7 @@ PROGRAM_BUILD = `date` $(USER)
 
 # DEFINE will contain some of the constants definitions decided in Makefile, 
 # including SYS_xx. It will be passed to C compiler.
-DEFINE += -DSYS_$(shell echo $(SYS) | sed 's/-.*//' | tr a-z A-Z)
+DEFINE += -DSYS_$(shell echo $(SYS) | sed 's/-.*//' | tr a-z. A-Z_)
 
 ################################################################################
 # Tuning and other variables - do not change anything except if you know
@@ -79,7 +82,7 @@ LIB += -lpthread -ldl
 endif
 
 ifneq (,$(findstring solaris,$(SYS)))
-LIB += -ldl -lsocket -lnsl -lposix4 -lpthread
+LIB += -ldl -lsocket -lnsl -lposix4 -lpthread -lresolv
 endif
 
 ifeq ($(SYS),beos)
@@ -104,9 +107,9 @@ endif
 # Optimizations : don't compile debug versions with them
 ifeq ($(OPTIMS),1)
 CFLAGS += -O6
-CFLAGS += -ffast-math -funroll-loops -fargument-noalias-global
-CFLAGS += -funroll-all-loops -fstrict-aliasing
-#CFLAGS += -fomit-frame-pointer
+CFLAGS += -ffast-math -funroll-loops -funroll-all-loops
+CFLAGS += -fomit-frame-pointer
+CFLAGS += @BIZARRE_OPTIMS@
 
 # Optimizations for x86 familiy
 ifneq (,$(findstring 86,$(ARCH)))
@@ -167,11 +170,9 @@ LCFLAGS += -Wall
 #
 # Debugging and profiling support (unless optimisations are active)
 #
-ifeq ($(DEBUG),1)
 ifneq ($(OPTIMS),1)
 CFLAGS += -g
 endif
-endif
 
 #################################################################################
 # Objects and files
@@ -188,8 +189,12 @@ INTERFACE =        src/interface/main.o \
                src/interface/intf_console.o
 
 INPUT =                src/input/input_ps.o \
+               src/input/input_ts.o \
                src/input/mpeg_system.o \
                src/input/input_ext-dec.o \
+               src/input/input_dec.o \
+               src/input/input_programs.o \
+               src/input/input_netlist.o \
                src/input/input.o
 
 AUDIO_OUTPUT =         src/audio_output/audio_output.o
@@ -212,9 +217,11 @@ AC3_DECODER =      src/ac3_decoder/ac3_decoder_thread.o \
 LPCM_DECODER = src/lpcm_decoder/lpcm_decoder_thread.o \
                src/lpcm_decoder/lpcm_decoder.o
 
-AUDIO_DECODER =        src/audio_decoder/audio_decoder_thread.o \
-               src/audio_decoder/audio_decoder.o \
-               src/audio_decoder/audio_math.o
+AUDIO_DECODER =        src/audio_decoder/audio_decoder.o \
+               src/audio_decoder/adec_generic.o \
+               src/audio_decoder/adec_layer1.o \
+               src/audio_decoder/adec_layer2.o \
+               src/audio_decoder/adec_math.o
 
 SPU_DECODER =  src/spu_decoder/spu_decoder.o
 
@@ -241,6 +248,7 @@ VIDEO_DECODER =     src/video_decoder/video_decoder.o \
 MISC =         src/misc/mtime.o \
                src/misc/tests.o \
                src/misc/rsc_files.o \
+               src/misc/modules.o \
                src/misc/netutils.o \
                src/misc/playlist.o \
                src/misc/plugins.o
@@ -253,7 +261,7 @@ C_OBJ =             $(INTERFACE) \
                $(AC3_DECODER) \
                $(LPCM_DECODER) \
                $(AUDIO_DECODER) \
-               $(SPU_DEOCDER) \
+               $(SPU_DECODER) \
                $(GEN_DECODER) \
                $(VIDEO_PARSER) \
                $(VIDEO_DECODER) \
@@ -310,6 +318,8 @@ PLUGIN_SDL =        plugins/sdl/sdl.o \
 #              plugins/sdl/video_yuv.o \
 #              plugins/sdl/video_yuvall.o
 
+PLUGIN_NULL =  plugins/null/null.o
+
 PLUGIN_GLIDE = plugins/glide/glide.o \
                plugins/glide/intf_glide.o \
                plugins/glide/vout_glide.o
@@ -359,7 +369,8 @@ STD_PLUGIN_OBJ =$(PLUGIN_BEOS) \
                $(PLUGIN_YUV) \
                $(PLUGIN_YUVMMX) \
                $(PLUGIN_SDL) \
-               $(PLUGIN_ALSA)
+               $(PLUGIN_ALSA) \
+               $(PLUGIN_NULL)
 
 #
 # Other lists of files
@@ -380,7 +391,7 @@ export
 all: vlc @ALIASES@ plugins
 
 clean:
-       rm -f $(C_OBJ) $(CPP_OBJ) $(ASM_OBJ) $(PLUGIN_OBJ)
+       rm -f $(C_OBJ) $(CPP_OBJ) $(ASM_OBJ) $(STD_PLUGIN_OBJ)
        rm -f vlc @ALIASES@ lib/*.so
 
 distclean: clean
@@ -427,7 +438,10 @@ snapshot:
        mv /tmp/${SNAPSHOTDIR}.tar.bz2 ..
        @echo "Sources are in ../${SNAPSHOTDIR}.tar.[gz,bz2]"
 
-plugins: $(PLUGINS:%=lib/%.so)
+plugins: lib $(PLUGINS:%=lib/%.so)
+
+lib:
+       mkdir -p lib
 
 FORCE:
 
@@ -479,7 +493,7 @@ ifeq ($(SYS),beos)
        rm -f ./plugins/_APP_
        ln -s ../vlc ./plugins/_APP_
 else
-       $(CC) $(CFLAGS) $(LCFLAGS) --export-dynamic  -o $@ $(C_OBJ) $(CPP_OBJ) $(ASM_OBJ)       
+       $(CC) $(CFLAGS) $(LCFLAGS) --export-dynamic @DYNAMIC_FLAG@ -o $@ $(C_OBJ) $(CPP_OBJ) $(ASM_OBJ) 
 endif
 
 lib/beos.so: $(PLUGIN_BEOS)
@@ -487,46 +501,49 @@ lib/beos.so: $(PLUGIN_BEOS)
 
 lib/esd.so: $(PLUGIN_ESD)
 ifneq (,$(findstring bsd,$(SYS)))
-       $(CC) -shared -lesd -o $@ $^
+       $(CC) $(LCFLAGS) -shared -lesd -o $@ $^
 else
-       $(CC) -shared -laudiofile -lesd -o $@ $^
+       $(CC) $(LCFLAGS) -shared -laudiofile -lesd -o $@ $^
 endif
 
 lib/dsp.so: $(PLUGIN_DSP)
-       $(CC) -shared -o $@ $^
+       $(CC) $(LCFLAGS) -shared -o $@ $^
 
 lib/alsa.so: $(PLUGIN_ALSA)
-       $(CC) -shared -o $@ $^
+       $(CC) $(LCFLAGS) -shared -o $@ $^
+
+lib/null.so: $(PLUGIN_NULL)
+       $(CC) $(LCFLAGS) -shared -o $@ $^
 
 lib/dummy.so: $(PLUGIN_DUMMY)
-       $(CC) -shared -o $@ $^
+       $(CC) $(LCFLAGS) -shared -o $@ $^
 
 lib/fb.so: $(PLUGIN_FB)
-       $(CC) -shared -o $@ $^
+       $(CC) $(LCFLAGS) -shared -o $@ $^
 
 lib/x11.so: $(PLUGIN_X11)
-       $(CC) -shared -L/usr/X11R6/lib -lX11 -lXext -o $@ $^
+       $(CC) $(LCFLAGS) -shared -L/usr/X11R6/lib -lX11 -lXext -o $@ $^
 
 lib/mga.so: $(PLUGIN_MGA)
-       $(CC) -shared -L/usr/X11R6/lib -lX11 -lXext -o $@ $^
+       $(CC) $(LCFLAGS) -shared -L/usr/X11R6/lib -lX11 -lXext -o $@ $^
 
 lib/gnome.so: $(PLUGIN_GNOME)
-       $(CC) -shared `gnome-config --libs gnomeui | sed 's,-rdynamic,,'` -o $@ $^
+       $(CC) $(LCFLAGS) -shared `gnome-config --libs gnomeui | sed 's,-rdynamic,,'` -o $@ $^
 
 lib/glide.so: $(PLUGIN_GLIDE)
-       $(CC) -shared -lglide2x -o $@ $^
+       $(CC) $(LCFLAGS) -shared $(LIB_GLIDE) -o $@ $^
 
 lib/ggi.so: $(PLUGIN_GGI)
-       $(CC) -shared -lggi -o $@ $^
+       $(CC) $(LCFLAGS) -shared $(LIB_GGI) -o $@ $^
 
 lib/sdl.so: $(PLUGIN_SDL)
-       $(CC) -shared -lSDL -o $@ $^
+       $(CC) $(LCFLAGS) -shared $(LIB_SDL) -o $@ $^
 
 lib/yuv.so: $(PLUGIN_YUV)
 ifeq ($(SYS),beos)
        $(CC) $(CFLAGS) -nostart -Xlinker -soname=$@ -o $@ $^ plugins/_APP_
 else
-       $(CC) -shared -o $@ $^
+       $(CC) $(LCFLAGS) -shared -o $@ $^
 endif
 
 lib/yuvmmx.so: $(PLUGIN_YUVMMX)