* Fixed my old stupid bug that disabled sound after having played the

[vlc] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index f5ca24304aa3dac9d77a08cb1cb414cbef26aaed..caa981ecfeb2b97dfb39b0ca2dba21c6da6dd7e9 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -44,16 +44,21 @@ DEFINE += -DSTATS
 endif
 
 # PROGRAM_BUILD is a complete identification of the build
-# ( we can't use fancy options with date since OSes like Solaris
-# or FreeBSD have strange date implementations )
+# (we can't use fancy options with date since OSes like Solaris
+# or FreeBSD have strange date implementations)
 PROGRAM_BUILD = `date` $(USER)
-# XXX: beos does not support hostname
+# XXX: beos does not support hostname (how lame...)
 #PROGRAM_BUILD = `date` $(USER)@`hostname`
 
 # 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_)
 
+# 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
+
 ################################################################################
 # Tuning and other variables - do not change anything except if you know
 # exactly what you are doing
@@ -179,21 +184,18 @@ INTERFACE =       src/interface/main.o \
                src/interface/intf_msg.o \
                src/interface/intf_cmd.o \
                src/interface/intf_ctrl.o \
+               src/interface/intf_plst.o \
+               src/interface/intf_channels.o \
                src/interface/intf_console.o
 
-INPUT =                src/input/input_ps.o \
-               src/input/input_ts.o \
-               src/input/dvd_ifo.o \
-               src/input/dvd_css.o \
-               src/input/input_dvd.o \
-               src/input/mpeg_system.o \
-               src/input/input_ext-dec.o \
+INPUT =                src/input/input_ext-dec.o \
                src/input/input_ext-intf.o \
                src/input/input_dec.o \
                src/input/input_programs.o \
                src/input/input_netlist.o \
                src/input/input_clock.o \
-               src/input/input.o
+               src/input/input.o \
+               src/input/mpeg_system.o
 
 AUDIO_OUTPUT =         src/audio_output/audio_output.o
 
@@ -237,9 +239,7 @@ 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
+               src/misc/netutils.o
 
 
 C_OBJ =                $(INTERFACE) \
@@ -276,6 +276,19 @@ endif
 #
 # Plugins
 #
+PLUGIN_NULL =  plugins/null/null.o
+
+PLUGIN_PS =    plugins/mpeg/ps.o \
+               plugins/mpeg/input_ps.o
+
+PLUGIN_TS =    plugins/mpeg/ts.o \
+               plugins/mpeg/input_ts.o
+
+PLUGIN_DVD =   plugins/dvd/dvd.o \
+               plugins/dvd/input_dvd.o \
+               plugins/dvd/dvd_ifo.o \
+               plugins/dvd/dvd_css.o
+
 PLUGIN_BEOS =  plugins/beos/beos.o \
                plugins/beos/aout_beos.o \
                plugins/beos/intf_beos.o \
@@ -284,7 +297,6 @@ PLUGIN_BEOS =       plugins/beos/beos.o \
 PLUGIN_DSP =   plugins/dsp/dsp.o \
                plugins/dsp/aout_dsp.o
 
-
 PLUGIN_DUMMY = plugins/dummy/dummy.o \
                plugins/dummy/aout_dummy.o \
                plugins/dummy/intf_dummy.o \
@@ -302,22 +314,18 @@ PLUGIN_GGI =      plugins/ggi/ggi.o \
                plugins/ggi/vout_ggi.o
 
 PLUGIN_SDL =   plugins/sdl/sdl.o \
-               plugins/sdl/intf_sdl.o \
                plugins/sdl/vout_sdl.o \
                plugins/sdl/aout_sdl.o 
 
-PLUGIN_NULL =  plugins/null/null.o
-
 PLUGIN_GLIDE = plugins/glide/glide.o \
                plugins/glide/intf_glide.o \
                plugins/glide/vout_glide.o
 
 PLUGIN_GNOME = plugins/gnome/gnome.o \
                plugins/gnome/intf_gnome.o \
-               plugins/gnome/intf_gnome_callbacks.o \
-               plugins/gnome/intf_gnome_interface.o \
-               plugins/gnome/intf_gnome_support.o \
-               plugins/gnome/vout_gnome.o
+               plugins/gnome/gnome_callbacks.o \
+               plugins/gnome/gnome_interface.o \
+               plugins/gnome/gnome_support.o
 
 PLUGIN_MGA =   plugins/mga/mga.o \
                plugins/mga/intf_mga.o \
@@ -446,9 +454,8 @@ snapshot:
        find -type d | while read i ; \
                do mkdir -p /tmp/vlc-@VLC_VERSION@/$$i ; \
        done
-       find debian -mindepth 1 -type d | grep -v CVS | while read i ; \
-               do rmdir $$i ; \
-       done
+       find debian -mindepth 1 -maxdepth 1 -type d | grep -v CVS | \
+               while read i ; do rm -rf /tmp/vlc-@VLC_VERSION@/$$i ; done
        # CVS entries
        find . -type f | grep CVS | while read i ; \
                do cp $$i /tmp/vlc-@VLC_VERSION@/$$i ; \
@@ -605,6 +612,15 @@ ifeq ($(SYS),beos)
 lib/null.so: $(PLUGIN_NULL)
        $(CC) -nostart -Xlinker -soname=$@ -o $@ $^ plugins/_APP_
 
+lib/ps.so: $(PLUGIN_PS)
+       $(CC) -nostart -Xlinker -soname=$@ -o $@ $^ plugins/_APP_
+
+lib/ts.so: $(PLUGIN_TS)
+       $(CC) -nostart -Xlinker -soname=$@ -o $@ $^ plugins/_APP_
+
+lib/dvd.so: $(PLUGIN_DVD)
+       $(CC) -nostart -Xlinker -soname=$@ -o $@ $^ plugins/_APP_
+
 lib/dummy.so: $(PLUGIN_DUMMY)
        $(CC) -nostart -Xlinker -soname=$@ -o $@ $^ plugins/_APP_
 
@@ -638,6 +654,15 @@ else
 lib/null.so: $(PLUGIN_NULL)
        $(CC) $(PCFLAGS) -shared -o $@ $^
 
+lib/ps.so: $(PLUGIN_PS)
+       $(CC) $(PCFLAGS) -shared -o $@ $^
+
+lib/ts.so: $(PLUGIN_TS)
+       $(CC) $(PCFLAGS) -shared -o $@ $^
+
+lib/dvd.so: $(PLUGIN_DVD)
+       $(CC) $(PCFLAGS) -shared -o $@ $^
+
 lib/dummy.so: $(PLUGIN_DUMMY)
        $(CC) $(PCFLAGS) -shared -o $@ $^