wizard.cpp -- change checkboxes to use wxALIGN_CENTER_VERTICAL|wxALL instead of wxLEF...

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 18ebfa19dc535493d7c2195089a3ef77e1fee8a7..028733eb3217652246b1b190255279b62900e932 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 = \
@@ -158,6 +158,15 @@ 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 \
@@ -247,12 +256,17 @@ EXTRA_DIST += \
 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
+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)
 
@@ -663,6 +677,17 @@ 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/ ;
+       cp $(top_builddir)/activex/*.reg $(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 \
@@ -673,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}
@@ -681,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}