]> git.sesse.net Git - vlc/blobdiff - Makefile.am
projects / vlc / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
test code fix
[vlc] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index d70a599d565e3276aac310903db876361cb911d7..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 = \
@@ -62,6 +62,9 @@ EXTRA_DIST += \
        extras/package/macosx/Resources/English.lproj/MainMenu.nib/classes.nib \
        extras/package/macosx/Resources/English.lproj/MainMenu.nib/info.nib \
        extras/package/macosx/Resources/English.lproj/MainMenu.nib/keyedobjects.nib \
+       extras/package/macosx/Resources/English.lproj/MediaInfo.nib/classes.nib \
+       extras/package/macosx/Resources/English.lproj/MediaInfo.nib/info.nib \
+       extras/package/macosx/Resources/English.lproj/MediaInfo.nib/keyedobjects.nib \
        extras/package/macosx/Resources/English.lproj/About.nib/classes.nib \
        extras/package/macosx/Resources/English.lproj/About.nib/info.nib \
        extras/package/macosx/Resources/English.lproj/About.nib/keyedobjects.nib \
@@ -128,7 +131,9 @@ EXTRA_DIST += \
        extras/package/macosx/Resources/play_blue.png \
        extras/package/macosx/Resources/stop.png \
        extras/package/macosx/Resources/stop_blue.png \
-       extras/package/macosx/Resources/display.png \
+       extras/package/macosx/Resources/display_left.png \
+       extras/package/macosx/Resources/display_middle.png \
+       extras/package/macosx/Resources/display_right.png \
        extras/package/macosx/Resources/display_slider.png \
        extras/package/macosx/Resources/display_track.png \
        extras/package/macosx/Resources/equalizerdrawer_active.png \
@@ -196,6 +201,32 @@ EXTRA_DIST += \
        extras/package/macosx/Resources/fs_exit_fullscreen_highlight.png \
        extras/package/macosx/Resources/fs_exit_fullscreen.png \
        extras/package/macosx/Resources/fs_background.png \
+       extras/package/macosx/Resources/add_embedded_graphite.png \
+       extras/package/macosx/Resources/equalizerdrawer_graphite.png \
+       extras/package/macosx/Resources/fullscreen_graphite.png \
+       extras/package/macosx/Resources/next_graphite.png \
+       extras/package/macosx/Resources/pause_embedded_graphite.png \
+       extras/package/macosx/Resources/pause_graphite.png \
+       extras/package/macosx/Resources/play_embedded_graphite.png \
+       extras/package/macosx/Resources/play_graphite.png \
+       extras/package/macosx/Resources/playlistdrawer_graphite.png \
+       extras/package/macosx/Resources/previous_graphite.png \
+       extras/package/macosx/Resources/repeat_embedded_graphite.png \
+       extras/package/macosx/Resources/repeat_single_embedded_graphite.png \
+       extras/package/macosx/Resources/shuffle_embedded_graphite.png \
+       extras/package/macosx/Resources/skip_forward_embedded_graphite.png \
+       extras/package/macosx/Resources/skip_forward_graphite.png \
+       extras/package/macosx/Resources/skip_previous_embedded_graphite.png \
+       extras/package/macosx/Resources/skip_previous_graphite.png \
+       extras/package/macosx/Resources/stop_graphite.png \
+       extras/package/macosx/Resources/volumeslider_graphite.png \
+       extras/package/macosx/Resources/noart.png \
+       extras/package/macosx/Resources/spref_cone_Audio_64.png \
+       extras/package/macosx/Resources/spref_cone_Hotkeys_64.png \
+       extras/package/macosx/Resources/spref_cone_Input_64.png \
+       extras/package/macosx/Resources/spref_cone_Interface_64.png \
+       extras/package/macosx/Resources/spref_cone_Subtitles_64.png \
+       extras/package/macosx/Resources/spref_cone_Video_64.png \
        extras/package/macosx/fullscreen_panel.svg \
        extras/package/macosx/ub.sh \
        extras/package/macosx/vlc.xcodeproj/project.pbxproj \
@@ -210,7 +241,15 @@ EXTRA_DIST += \
        extras/package/macosx/plugin/InstallerInfo.plist \
        extras/package/macosx/plugin/InstallerDescription.plist \
        extras/package/macosx/plugin/pbdevelopment.plist \
-       extras/package/macosx/plugin/English.lproj/InfoPlist.strings
+       extras/package/macosx/plugin/English.lproj/InfoPlist.strings \
+       extras/package/macosx/eyetvplugin/EyeTVPluginDefs.h \
+       extras/package/macosx/eyetvplugin/Info.plist \
+       extras/package/macosx/eyetvplugin/eyetvplugin.c \
+       extras/package/macosx/eyetvplugin/eyetvplugin.h \
+       extras/package/macosx/eyetvplugin/English.lproj/InfoPlist.strings \
+       extras/package/macosx/eyetvplugin/eyetvplugin.xcodeproj/project.pbxproj \
+       extras/package/macosx/README.MacOSX.rtf
+
 
 ###############################################################################
 # Various utilities ( editor syntax files, D-Bus controller ... )
@@ -411,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}` ; \
@@ -643,6 +670,7 @@ package-win-common:
             || true ; \
        done
 
+if BUILD_LUA
        mkdir -p "$(top_builddir)/vlc-$(VERSION)/lua/http/images"
        mkdir -p "$(top_builddir)/vlc-$(VERSION)/lua/http/requests"
        mkdir -p "$(top_builddir)/vlc-$(VERSION)/lua/http/js"
@@ -665,7 +693,9 @@ package-win-common:
        unix2dos $(top_builddir)/vlc-$(VERSION)/lua/http/requests/*.xml ;
        cp $(srcdir)/share/lua/http/requests/readme $(top_builddir)/vlc-$(VERSION)/lua/http/requests/readme.txt ;
        unix2dos $(top_builddir)/vlc-$(VERSION)/lua/http/requests/readme.txt ;
+endif
 
+if BUILD_HTTPD
        mkdir -p "$(top_builddir)/vlc-$(VERSION)/http/images"
        mkdir -p "$(top_builddir)/vlc-$(VERSION)/http/requests"
        mkdir -p "$(top_builddir)/vlc-$(VERSION)/http/js"
@@ -702,6 +732,7 @@ package-win-common:
        cp $(srcdir)/share/http/old/admin/*.html $(top_builddir)/vlc-$(VERSION)/http/old/admin/ ;
        unix2dos $(top_builddir)/vlc-$(VERSION)/http/old/admin/*.html ;
        cp $(srcdir)/share/http/old/admin/.access $(top_builddir)/vlc-$(VERSION)/http/old/admin/ ;
+endif
 
        cp $(srcdir)/share/vlc48x48.ico $(top_builddir)/vlc-$(VERSION)/ ;
 
@@ -747,6 +778,7 @@ package-win32-base-debug: package-win-common
             "$(top_builddir)/vlc-$(VERSION)/plugins/" ; \
          fi ; done
 
+if BUILD_SKINS
 # Skins
        mkdir -p $(top_builddir)/vlc-$(VERSION)/skins/fonts
        for i in $(srcdir)/share/skins2/fonts/*.*; do \
@@ -755,7 +787,9 @@ package-win32-base-debug: package-win-common
        for i in $(srcdir)/share/skins2/*.*; do \
          cp $$i $(top_builddir)/vlc-$(VERSION)/skins/ || true ; \
        done
+endif
 
+if BUILD_LUA
 #Lua Scripts
        $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/scripts/playlist
        for i in $(srcdir)/share/lua/playlist/*.* ; do \
@@ -773,7 +807,9 @@ package-win32-base-debug: package-win-common
        for i in $(srcdir)/share/lua/intf/modules/*.* ; do \
          $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/scripts/intf/modules/`basename $${i}` ; \
        done ;
+endif
 
+if BUILD_OSDMENU
 #OSD Menu
        mkdir -p "$(top_builddir)/vlc-$(VERSION)/osdmenu"
        cp $(srcdir)/share/osdmenu/*.* "$(top_builddir)/vlc-$(VERSION)/osdmenu"
@@ -789,7 +825,7 @@ package-win32-base-debug: package-win-common
                if sed 's%/%\\%g' $$file.tmp >$$file; then :; else exit 1; fi; \
                rm -f $$file.tmp; \
        done
-
+endif
 
 package-win32-base: package-win32-base-debug package-win-common-strip
        for i in "" $(top_builddir)/vlc-$(VERSION)/plugins/*$(LIBEXT) ; \
@@ -961,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
Unnamed repository; edit this file 'description' to name the repository.