]> git.sesse.net Git - vlc/blobdiff - Makefile.am
projects / vlc / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
wx: bunch more event function parameter changes
[vlc] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 9ab3987632ba41898957f08046d4cbbd404a6839..b83e4cd993ab8239568213a81d413e8f650db69a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,7 +11,7 @@ NULL =
 #  - modules should come before . because vlc needs the builtins
 #  - . should come before mozilla because the plugin needs libvlc_pic.a
 #  - po should come before . because VLC.app needs the pofiles
-SUBDIRS = intl modules po . mozilla share m4 doc
+SUBDIRS = intl modules po . mozilla activex share m4 doc
 DIST_SUBDIRS = $(SUBDIRS) src debian ipkg lib
 
 EXTRA_DIST = \
@@ -24,7 +24,6 @@ EXTRA_DIST = \
        src/extras/COPYING \
        toolbox \
        vlc-config.in.in \
-       vlc.ebuild \
        vlc.spec \
        vlc.spec.mdk \
        vlc.win32.nsi \
@@ -126,13 +125,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
@@ -158,8 +157,16 @@ EXTRA_DIST += \
        extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib \
        extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib \
        extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib \
+       extras/MacOSX/Resources/English.lproj/About.nib/classes.nib \
+       extras/MacOSX/Resources/English.lproj/About.nib/info.nib \
+       extras/MacOSX/Resources/English.lproj/About.nib/keyedobjects.nib \
+       extras/MacOSX/Resources/English.lproj/Open.nib/classes.nib \
+       extras/MacOSX/Resources/English.lproj/Open.nib/info.nib \
+       extras/MacOSX/Resources/English.lproj/Open.nib/keyedobjects.nib \
+       extras/MacOSX/Resources/English.lproj/Preferences.nib/classes.nib \
+       extras/MacOSX/Resources/English.lproj/Preferences.nib/info.nib \
+       extras/MacOSX/Resources/English.lproj/Preferences.nib/keyedobjects.nib \
        extras/MacOSX/Resources/English.lproj/InfoPlist.strings \
-       extras/MacOSX/Resources/English.lproj/vlc.scriptTerminology \
        extras/MacOSX/Resources/a52.icns \
        extras/MacOSX/Resources/aac.icns \
        extras/MacOSX/Resources/asf.icns \
@@ -219,6 +226,7 @@ EXTRA_DIST += \
        extras/MacOSX/Resources/volumetrack.png \
        extras/MacOSX/Resources/about_bg.png \
        extras/MacOSX/Resources/vlc.scriptSuite \
+       extras/MacOSX/Resources/vlc.scriptTerminology \
        extras/MacOSX/Resources/README \
        extras/MacOSX/vlc.pbproj/project.pbxproj \
        extras/MacOSX/macosx-dmg \
@@ -245,14 +253,21 @@ EXTRA_DIST += \
        $(NULL)
 
 dist-hook:
-       cp $(distdir)/vlc.ebuild $(distdir)/vlc-${VERSION}.ebuild
        cd $(distdir) && srcdir=$(srcdir) $(srcdir)/toolbox --update-vc
+       distdir=$(distdir) srcdir=$(srcdir) $(srcdir)/toolbox --dist-contrib
 
 ###############################################################################
 # Building libvlc
 ###############################################################################
 
 bin_SCRIPTS = vlc-config
+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)
 
@@ -276,6 +291,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
@@ -310,7 +328,6 @@ SOURCES_libvlc_win32 = \
 
 SOURCES_libvlc_dirent = \
        src/extras/dirent.c \
-       src/extras/dirent.h \
        $(NULL)
 
 SOURCES_libvlc_getopt = \
@@ -330,7 +347,6 @@ SOURCES_libvlc_common = \
        src/playlist/view.c \
        src/playlist/item.c \
        src/playlist/item-ext.c \
-       src/playlist/info.c \
        src/playlist/services_discovery.c \
        src/input/access.c \
        src/input/clock.c \
@@ -560,8 +576,6 @@ VLC.app: vlc
              $(top_builddir)/VLC.app/Contents/Resources/$${i}.lproj ; \
          ln -sf ../English.lproj/MainMenu.nib \
              $(top_builddir)/VLC.app/Contents/Resources/$${i}.lproj ; \
-         ln -sf ../English.lproj/vlc.scriptTerminology \
-             $(top_builddir)/VLC.app/Contents/Resources/$${i}.lproj ; \
        done
        printf "APPLVLC#" >| $(top_builddir)/VLC.app/Contents/PkgInfo
 endif
@@ -664,6 +678,16 @@ if BUILD_MOZILLA
        cp $(top_builddir)/mozilla/vlcintf.xpt  $(top_builddir)/vlc-${VERSION}/mozilla/ ;
 endif
 
+       mkdir -p "$(top_builddir)/vlc-${VERSION}/activex"
+if BUILD_ACTIVEX
+       cp $(top_builddir)/activex/README.TXT  $(top_builddir)/vlc-${VERSION}/activex/ ;
+       cp $(top_builddir)/activex/test.html  $(top_builddir)/vlc-${VERSION}/activex/ ;
+       unix2dos $(top_builddir)/vlc-${VERSION}/activex/* ;
+
+       cp $(top_builddir)/activex/*$(LIBEXT) $(top_builddir)/vlc-${VERSION}/activex/ ;
+       $(STRIP) $(top_builddir)/vlc-${VERSION}/activex/*$(LIBEXT);
+endif
+
 package-win32-base-exe:
 # Create package
        wine ~/.wine/fake_windows/Program\ Files/NSIS/makensis.exe \
@@ -674,6 +698,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}
@@ -682,6 +710,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}
@@ -713,8 +745,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 {} \; ;
Unnamed repository; edit this file 'description' to name the repository.