* Fixed a copy/paste error from previous commit.

[vlc] / Makefile

diff --git a/Makefile b/Makefile
index fce0309ef8d2f9409ba7d600d9a45cfe0490f6bf..2dfe93df50eda43ee946eee7748888a6a1a7aab3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -16,12 +16,13 @@ endif
 PLUGINS_DIR := ac3_adec \
                ac3_spdif \
                alsa \
+               arts \
                beos \
-               darwin \
                directx \
                dsp \
                dummy \
                dvd \
+               dvdread \
                esd \
                fb \
                ggi \
@@ -33,6 +34,8 @@ PLUGINS_DIR :=        ac3_adec \
                kde \
                lpcm_adec \
                macosx \
+               mad_adec \
+               memcpy \
                mga \
                motion \
                mpeg \
@@ -49,13 +52,14 @@ PLUGINS_DIR :=      ac3_adec \
 PLUGINS_TARGETS := ac3_adec/ac3_adec \
                ac3_spdif/ac3_spdif \
                alsa/alsa \
+               arts/arts \
                beos/beos \
-               darwin/darwin \
                directx/directx \
                dsp/dsp \
                dummy/dummy \
                dummy/null \
                dvd/dvd \
+               dvdread/dvdread \
                esd/esd \
                fb/fb \
                ggi/ggi \
@@ -76,7 +80,11 @@ PLUGINS_TARGETS := ac3_adec/ac3_adec \
                kde/kde \
                lpcm_adec/lpcm_adec \
                macosx/macosx \
-               macosx/macosx_qt \
+               mad_adec/mad \
+               memcpy/memcpy \
+               memcpy/memcpymmx \
+               memcpy/memcpymmxext \
+               memcpy/memcpy3dn \
                mga/mga \
                motion/motion \
                motion/motionmmx \
@@ -159,8 +167,8 @@ endif
 #
 # Misc variables
 #
-VLC_QUICKVERSION := $(shell grep '^ *VLC_VERSION=[0-9]' configure.in | head -1 | cut -f2 -d=)
-LIBDVDCSS_QUICKVERSION := $(shell grep '^ *LIBDVDCSS_VERSION=[0-9]' configure.in | head -1 | cut -f2 -d=)
+VLC_QUICKVERSION := $(shell grep '^ *VLC_VERSION=' configure.in | head -1 | sed 's/"//g' | cut -f2 -d=)
+LIBDVDCSS_QUICKVERSION := $(shell grep '^ *LIBDVDCSS_VERSION=' configure.in | head -1 | sed 's/"//g' | cut -f2 -d=)
 
 
 # All symbols must be exported
@@ -196,7 +204,7 @@ show:
 #
 # Cleaning rules
 #
-clean: libdvdcss-clean plugins-clean vlc-clean
+clean: libdvdcss-clean libdvdread-clean plugins-clean vlc-clean
        rm -f src/*/*.o extras/*/*.o
        rm -f lib/*.so* lib/*.a
        rm -f plugins/*.so plugins/*.a
@@ -205,6 +213,9 @@ clean: libdvdcss-clean plugins-clean vlc-clean
 libdvdcss-clean:
        -cd extras/libdvdcss && $(MAKE) clean
 
+libdvdread-clean:
+       -cd extras/libdvdread && $(MAKE) clean
+
 plugins-clean:
        for dir in $(PLUGINS_DIR) ; do \
                ( cd plugins/$${dir} && $(MAKE) clean ) ; done
@@ -366,7 +377,7 @@ package-win32:
                README README.libdvdcss FAQ TODO tmp/
        for file in gtk-1.3.dll gdk-1.3.dll glib-1.3.dll gmodule-1.3.dll \
                gnu-intl.dll SDL.dll README-SDL.txt ; \
-                       do cp ../win32-libs/$$file tmp/ ; done
+                       do cp ${DLL_PATH}/$$file tmp/ ; done
        mkdir tmp/share
        for file in default8x16.psf default8x9.psf ; \
                do cp share/$$file tmp/share/ ; done
@@ -449,8 +460,8 @@ ifneq (,$(findstring darwin,$(SYS)))
        rm -Rf vlc.app
        cd extras/MacOSX ; pbxbuild | grep -v '^ ' | grep -v '^\t'
        cp -r extras/MacOSX/build/vlc.bundle ./vlc.app
-       $(INSTALL) -d vlc vlc.app/Contents/MacOS/share
-       $(INSTALL) -d vlc vlc.app/Contents/MacOS/plugins
+       $(INSTALL) -d vlc.app/Contents/MacOS/share
+       $(INSTALL) -d vlc.app/Contents/MacOS/plugins
        $(INSTALL) vlc vlc.app/Contents/MacOS/
 ifneq (,$(PLUGINS))
        $(INSTALL) $(PLUGINS:%=plugins/%.so) vlc.app/Contents/MacOS/plugins
@@ -531,3 +542,10 @@ $(BUILTIN_OBJ): FORCE
 #
 libdvdcss: Makefile.opts
        cd extras/libdvdcss && $(MAKE)
+
+#
+# libdvdread target
+#
+libdvdread: Makefile.opts
+       cd extras/libdvdread && $(MAKE)
+