X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=16a4298c99abedc95317afc3303244275fd45165;hb=6b0d4285f439b7b2bba24c8e948da63cf92f6c1a;hp=23d56c994a60b9ab7125993e406556edfc5f03b3;hpb=7770c2f21b4758746462b01a95a274a413e83dc4;p=vlc

diff --git a/Makefile.am b/Makefile.am
index 23d56c994a..16a4298c99 100644
--- 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 \
@@ -596,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; \
@@ -710,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; \
@@ -1064,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