marq.c -- allow relative positioning, like logo, via --marq-pos

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 1fb66cf645f28088d6c81b0f4808c8e39a8c560d..0f930e6c6565e60a1a9fe051132df90c3fb10dd2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -160,13 +160,13 @@ EXTRA_DIST += \
        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/objects.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/objects.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/objects.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 \
@@ -263,6 +263,10 @@ 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 $@
 
 lib_LIBRARIES = lib/libvlc.a $(LIBRARIES_libvlc_pic)
 
@@ -286,6 +290,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
@@ -673,6 +680,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 \
@@ -683,6 +700,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}
@@ -691,6 +712,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}
@@ -722,8 +747,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 {} \; ;