- build vlc_symbol.h modules_plugin.h and modules_builtin.h in top_builddir

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 028733eb3217652246b1b190255279b62900e932..34e4c5e6ca1736def628ebdc127d9a52639401ff 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -263,11 +263,14 @@ dist-hook:
 ###############################################################################
 
 bin_SCRIPTS = vlc-config
-CLEANFILES = $(bin_SCRIPTS)
 vlc-config: $(top_builddir)/config.status $(top_builddir)/vlc-config.in
        cd $(top_builddir) && $(SHELL) ./config.status --file=$@
        -cd $(top_builddir) && chmod 0755 $@
 
+$(SOURCES): vlc-config
+
+CLEANFILES = $(BUILT_SOURCES)
+
 lib_LIBRARIES = lib/libvlc.a $(LIBRARIES_libvlc_pic)
 
 lib_libvlc_a_SOURCES = $(SOURCES_libvlc)
@@ -290,6 +293,9 @@ endif
 if HAVE_WIN32
 OPT_SOURCES_libvlc_win32 = $(SOURCES_libvlc_win32)
 endif
+if HAVE_WINCE
+OPT_SOURCES_libvlc_win32 = $(SOURCES_libvlc_win32)
+endif
 if BUILD_DIRENT
 OPT_SOURCES_libvlc_dirent = $(SOURCES_libvlc_dirent)
 endif
@@ -324,7 +330,6 @@ SOURCES_libvlc_win32 = \
 
 SOURCES_libvlc_dirent = \
        src/extras/dirent.c \
-       src/extras/dirent.h \
        $(NULL)
 
 SOURCES_libvlc_getopt = \
@@ -684,7 +689,6 @@ if BUILD_ACTIVEX
        unix2dos $(top_builddir)/vlc-${VERSION}/activex/* ;
 
        cp $(top_builddir)/activex/*$(LIBEXT) $(top_builddir)/vlc-${VERSION}/activex/ ;
-       cp $(top_builddir)/activex/*.reg $(top_builddir)/vlc-${VERSION}/activex/ ;
        $(STRIP) $(top_builddir)/vlc-${VERSION}/activex/*$(LIBEXT);
 endif
 
@@ -745,8 +749,8 @@ package-beos:
        mv $(srcdir)/tmp/vlc-${VERSION} $(srcdir)/tmp/vlc ;
 
 # Create normal package
-       strip --strip-debug --strip-unneeded $(srcdir)/tmp/vlc/vlc ;
-       find $(srcdir)/tmp/vlc -name 'lib*.so' -exec strip \
+       $(STRIP) --strip-debug --strip-unneeded $(srcdir)/tmp/vlc/vlc ;
+       find $(srcdir)/tmp/vlc -name 'lib*.so' -exec $(STRIP) \
          --strip-debug --strip-unneeded "{}" \; ;
        xres -o $(srcdir)/tmp/vlc/vlc $(srcdir)/share/vlc_beos.rsrc ;
        find $(srcdir)/tmp/vlc -exec mimeset -f {} \; ;