test code fix

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 0649ee988888759e6cc0bf05434ba57d9801881f..08a1a4788138a604f62957e6f224077927e26997 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,7 @@
 #  - src (libvlc) is nedeed by modules, mozilla and bindings
 #  - libs/* are needed by modules
 SUBDIRS = po libs/loader libs/srtp src modules \
-               projects/mozilla bindings projects/activex share doc
+               projects/mozilla bindings projects/activex share doc test
 DIST_SUBDIRS = $(SUBDIRS) m4  extras/package/ipkg
 
 EXTRA_DIST = \
@@ -450,19 +450,7 @@ VLC-release.app: vlc
                  $(top_builddir)/VLC-release.app; \
        rm -Rf $(top_builddir)/tmp
        $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS
-       $(INSTALL) $(top_builddir)/src/.libs/vlc \
-                  $(top_builddir)/VLC-release.app/Contents/MacOS/VLC
-       ln -sf ./VLC $(top_builddir)/VLC-release.app/Contents/MacOS/clivlc
-       $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/modules
-       for i in "" `$(VLC_CONFIG) --target plugin` ; do \
-         if test -n "$$i" ; \
-           then $(INSTALL) "`pwd`/`dirname $$i`/.libs/`basename $$i`$(LIBEXT)" \
-                          "$(top_builddir)/VLC-release.app/Contents/MacOS/modules" ; \
-         fi ; done
-       $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/lib ; \
-         for i in $(srcdir)/src/.libs/*.dylib ; do \
-           $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/lib/`basename $${i}` ; \
-         done ;
+       ACTION="VLC-release.app" src_dir=$(srcdir) build_dir=$(top_builddir) sh $(srcdir)/projects/macosx/framework/Pre-Compile.sh
        $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/playlist
        for i in $(srcdir)/share/lua/playlist/*.* ; do \
          $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/playlist/`basename $${i}` ; \
@@ -1009,6 +997,33 @@ package-macosx:
 # Clean up
        rm -Rf "$(top_builddir)/vlc-$(VERSION)" ;
 
+package-macosx-zip:
+       rm -Rf $(top_builddir)/vlc-$(VERSION)
+       mkdir -p $(top_builddir)/vlc-$(VERSION)
+       cp -R $(top_builddir)/VLC-release.app $(top_builddir)/vlc-$(VERSION)/VLC.app
+       mkdir -p $(top_builddir)/vlc-$(VERSION)/Goodies
+       for i in AUTHORS COPYING ChangeLog README THANKS NEWS; do \
+         cp $(srcdir)/$$i $(top_builddir)/vlc-$(VERSION)/Goodies; \
+       done
+       cp -R  $(srcdir)/extras/package/macosx/Delete_Preferences.app \
+            $(top_builddir)/vlc-$(VERSION)/Goodies
+       cp $(srcdir)/extras/package/macosx/README.MacOSX.rtf \
+          $(top_builddir)/vlc-$(VERSION)
+       zip -r $(top_builddir)/vlc-$(VERSION).zip $(top_builddir)/vlc-$(VERSION)
+       rm -Rf $(top_builddir)/vlc-$(VERSION)
+
+package-macosx-framework-zip:
+       rm -Rf $(top_builddir)/vlckit-$(VERSION)
+       mkdir -p $(top_builddir)/vlckit-$(VERSION)
+       cp -R $(srcdir)/projects/macosx/framework/build/Debug/VLCKit.framework \
+         $(top_builddir)/vlckit-$(VERSION)/VLCKit.framework
+       mkdir -p $(top_builddir)/vlc-$(VERSION)/Goodies
+       for i in AUTHORS COPYING ChangeLog README THANKS NEWS; do \
+         cp $(srcdir)/$$i $(top_builddir)/vlckit-$(VERSION)/Goodies; \
+       done
+       zip -r $(top_builddir)/vlckit-$(VERSION).zip $(top_builddir)/vlckit-$(VERSION)
+       rm -Rf $(top_builddir)/vlc-$(VERSION)
+
 package-macosx-plugin:
 if BUILD_MOZILLA
 # Create Installer