X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=c5b4f7cb235e67bc7a881368de913c4f7a761a06;hb=122163a27f38f179d2beee4f6db6ced07c132bd8;hp=e9609d428bfb6dd5cf99a83cba0703e6349b9ffc;hpb=0410da919e44a671caf5b312bd4619d58fbe8971;p=vlc

diff --git a/Makefile.am b/Makefile.am
index e9609d428b..c5b4f7cb23 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -126,13 +126,13 @@ HEADERS_include_built = \
 	include/vlc_symbols.h \
 	$(NULL)
 
-include/vlc_symbols.h: Makefile $(HEADERS_include)
+include/vlc_symbols.h: Makefile $(HEADERS_include) vlc-config
 	srcdir=$(srcdir) $(srcdir)/toolbox --update-includes
 
-src/misc/modules_plugin.h: Makefile src/misc/modules_plugin.h.in $(HEADERS_include)
+src/misc/modules_plugin.h: Makefile src/misc/modules_plugin.h.in $(HEADERS_include) vlc-config
 	srcdir=$(srcdir) $(srcdir)/toolbox --update-includes
 
-src/misc/modules_builtin.h: Makefile src/misc/modules_builtin.h.in
+src/misc/modules_builtin.h: Makefile src/misc/modules_builtin.h.in vlc-config
 	srcdir=$(srcdir) $(srcdir)/toolbox --update-includes
 
 # These dependencies are mandatory
@@ -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
 
@@ -698,6 +702,10 @@ package-win32-base-exe-cygwin:
 	C:/Program\ Files/NSIS/makensis.exe \
              /DVERSION=${VERSION} $(top_builddir)/vlc-${VERSION}/vlc.win32.nsi
 
+package-win32-base-exe-linux:
+# Create package
+	makensis -DVERSION=${VERSION} $(top_builddir)/vlc-${VERSION}/vlc.win32.nsi
+
 package-win32-base-zip:
 # Create package 
 	zip -r vlc-${VERSION}-win32.zip vlc-${VERSION}
@@ -706,6 +714,10 @@ package-win32-exe: package-win32-base package-win32-base-exe
 # Clean up
 	rm -Rf $(top_builddir)/vlc-${VERSION}
 
+package-win32-exe-linux: package-win32-base package-win32-base-exe-linux
+# Clean up
+	rm -Rf $(top_builddir)/vlc-${VERSION}
+
 package-win32-zip: package-win32-base package-win32-base-zip
 # Clean up
 	rm -Rf $(top_builddir)/vlc-${VERSION}
@@ -737,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 {} \; ;