* Prevent the autoplay function from playing the Shoutcast url for the xmllist. The...

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index ee8732583200d66a8dbb685f81b6938d33661b44..16a4298c99abedc95317afc3303244275fd45165 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,13 +32,15 @@ EXTRA_DIST = \
        src/misc/modules_builtin.h.in \
        $(NULL)
 
-BUILT_SOURCES = \
-       vlc-config \
+BUILT_SOURCES_distclean = vlc-config
+BUILT_SOURCES_clean = \
        stamp-api \
        src/misc/modules_builtin.h \
        src/misc/version.c \
        $(NULL)
 
+BUILT_SOURCES = $(BUILT_SOURCES_distclean) $(BUILT_SOURCES_clean)
+
 SUFFIXES = 
 
 # Tell aclocal to use -I m4. Wonder if it really works.
@@ -84,7 +86,6 @@ HEADERS_include = \
        include/modules_inner.h \
        include/mtime.h \
        include/network.h \
-       include/osd.h \
        include/os_specific.h \
        include/snapshot.h \
        include/stream_output.h \
@@ -134,6 +135,8 @@ src/misc/modules_builtin.h: Makefile src/misc/modules_builtin.h.in vlc-config
        srcdir=$(srcdir) $(srcdir)/toolbox --update-includes
        touch src/misc/modules_builtin.h
 
+src/misc/modules.c: src/misc/modules_builtin.h
+
 src/misc/version.c: FORCE
        srcdir=$(srcdir) $(srcdir)/toolbox --update-version
 
@@ -174,6 +177,12 @@ EXTRA_DIST += \
        extras/MacOSX/Resources/English.lproj/Bookmarks.nib/classes.nib \
        extras/MacOSX/Resources/English.lproj/Bookmarks.nib/info.nib \
        extras/MacOSX/Resources/English.lproj/Bookmarks.nib/keyedobjects.nib \
+       extras/MacOSX/Resources/English.lproj/Extended.nib/classes.nib \
+       extras/MacOSX/Resources/English.lproj/Extended.nib/info.nib \
+       extras/MacOSX/Resources/English.lproj/Extended.nib/keyedobjects.nib \
+       extras/MacOSX/Resources/English.lproj/Update.nib/classes.nib \
+       extras/MacOSX/Resources/English.lproj/Update.nib/info.nib \
+       extras/MacOSX/Resources/English.lproj/Update.nib/keyedobjects.nib \
        extras/MacOSX/Resources/English.lproj/InfoPlist.strings \
        extras/MacOSX/Resources/a52.icns \
        extras/MacOSX/Resources/aac.icns \
@@ -280,8 +289,8 @@ vlc-config.in: vlc-config.in.in
        ./config.status --recheck
 
 MOSTLYCLEANFILES = $(DATA_noinst_libvlc)
-CLEANFILES = $(BUILT_SOURCES) stamp-builtin
-DISTCLEANFILES = vlc-config.in
+CLEANFILES = $(BUILT_SOURCES_clean) stamp-builtin
+DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in
 
 if HAVE_WIN32
 lib_LIBRARIES = lib/libvlc.a
@@ -419,8 +428,9 @@ SOURCES_libvlc_common = \
        src/stream_output/sap.c \
        src/stream_output/acl.c \
        src/osd/osd.c \
-       src/osd/osd_widgets.c \
        src/osd/osd_parser.c \
+       src/osd/osd_text.c \
+       src/osd/osd_widgets.c \
        src/misc/charset.c \
        src/misc/httpd.c \
        src/misc/tls.c \
@@ -527,18 +537,20 @@ vlc-bundle: vlc
        find $(top_builddir)/vlc-bundle -type f -exec mimeset -f "{}" \;
 endif
 
-# Install the symlinks
+# Install the symlinks and shared libvlc
 install-exec-local:
        for i in "" $(ALIASES) ; do if test -n "$$i" ; then \
          rm -f "$(DESTDIR)$(bindir)/$$i" && \
          ln -s vlc "$(DESTDIR)$(bindir)/$$i" ; \
        fi ; done
+       test -z "$(DATA_noinst_libvlc)" || $(INSTALL_PROGRAM) "$(DATA_noinst_libvlc)" "$(DESTDIR)$(libdir)"
 
 # the opposite of install-{data,exec}-local
 uninstall-local:
        for i in "" $(ALIASES) ; do if test -n "$$i" ; then \
          rm -f "$(DESTDIR)$(bindir)/$$i" ; \
        fi ; done
+       test -z "$(DATA_noinst_libvlc)" || rm -f "$(DESTDIR)$(libdir)/$(DATA_noinst_libvlc)"
 
 if HAVE_DARWIN
 # Create the MacOS X app
@@ -594,8 +606,10 @@ VLC-release.app: vlc
            wizard.m \
            extended.h \
            extended.m \
-        bookmarks.h \
-        bookmarks.m \
+           bookmarks.h \
+           bookmarks.m \
+           update.h \
+           update.m \
            vout.m; do \
          cp "$(srcdir)/modules/gui/macosx/$$i" \
              $(top_builddir)/tmp/modules/gui/macosx; \
@@ -708,8 +722,10 @@ VLC.app: vlc
            wizard.m \
            extended.h \
            extended.m \
-        bookmarks.h \
-        bookmarks.m \
+           bookmarks.h \
+           bookmarks.m \
+           update.h \
+           update.m \
            vout.m; do \
          cp "$(srcdir)/modules/gui/macosx/$$i" \
              $(top_builddir)/tmp/modules/gui/macosx; \
@@ -1062,7 +1078,7 @@ update-po:
            | sort ; \
        } > $(top_srcdir)/po/POTFILES.in
        rm -f $(top_srcdir)/po/vlc.pot
-       cd po && $(MAKE) POTFILES $(top_srcdir)/../po/vlc.pot update-po
+       cd po && $(MAKE) POTFILES vlc.pot update-po
 
 #cd po && $(MAKE) update-po