Uses add_password for passwords

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index aa2e3bacad2c17b6d0529512cc7bb6af0e1dc869..c69fe3afabc282c5b3ee13091eefae74fef1dd25 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -249,7 +249,7 @@ nodist_EXTRA_vlc_SOURCES = extras/zsh.cpp src/misc/darwin_specific.m
 vlc_DEPENDENCIES = $(LIBVLC) $(DATA_win32_rc)
 
 vlc_LDADD = $(DATA_win32_rc) $(LIBVLC) $(LTLIBINTL)
-vlc_LDFLAGS =
+vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc`
 if !HAVE_PLUGINS
 vlc_LDFLAGS += `$(VLC_CONFIG) --target plugin | sed -e 's/\_plugin /_plugin.la /g'`
 endif
@@ -258,6 +258,10 @@ vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
 LIB_libvlc = libvlc.la
 LIBVLC = src/$(LIB_libvlc)
 
+#To get some nice output
+nice:
+               $(top_builddir)/compile
+
 # Shortcut for developpers to rebuild the core (libvlc + vlc)
 # Don't use it if you don't know what it is about.
 # Don't complain if it doesn't work. -- Courmisch
@@ -592,30 +596,12 @@ share/vlc_win32_rc.$(OBJEXT): share/vlc_win32_rc.rc
 endif
 
 
-###############################################################################
-# Building specific source packages
-###############################################################################
-
-dist-woody: distdir
-       $(remove_distdir_woody)
-       mv $(distdir) $(PACKAGE)-woody-$(VERSION)
-       $(srcdir)/toolbox --make-woody $(PACKAGE)-woody-$(VERSION)
-       $(AMTAR) chof - $(PACKAGE)-woody-$(VERSION) \
-         | GZIP=$(GZIP_ENV) gzip -c >$(PACKAGE)-woody-$(VERSION).tar.gz
-       $(remove_distdir_woody)
-
-remove_distdir_woody = \
-  { test ! -d $(PACKAGE)-woody-$(VERSION) \
-    || { find $(PACKAGE)-woody-$(VERSION) -type d ! -perm -200 \
-           -exec chmod u+w {} ';' \
-         && rm -fr $(PACKAGE)-woody-$(VERSION); }; }
-
 ###############################################################################
 # Building architecture-specific binary packages
 ###############################################################################
 
 # XXX: this rule is probably only useful to you if you have exactly
-# the same setup as me. Contact sam@zoy.org if you need to use it.
+# the same setup as the maintaner(s).
 #
 
 package-win-common:
@@ -1000,6 +986,8 @@ package-translations:
 
 ###############################################################################
 # PO translation files update
+# Generate po/POTFILES.in which lists all the files containing translatable
+# strings. Find all source files and remove the generated files
 ###############################################################################
 .PHONY: update-po
 
@@ -1017,7 +1005,7 @@ update-po:
          echo "# modules" ; \
          find modules -name '*.[chm]' -o -name '*.[ch]pp' -o -wholename 'modules/gui/qt4/ui/*.ui'\
            | grep -v '\(\.moc\.\|gui/gtk2/\)' \
-           | grep -vE 'qt4/ui/.*.h' |grep -v qt4/resources.cpp \
+           | grep -vE 'qt4/ui/.*.h' |grep -v 'qt4/resources.cpp\|qt4/dialogs/about.hpp' \
            | sort ; \
        } > $(top_srcdir)/po/POTFILES.in
        rm -f $(top_srcdir)/po/vlc.pot