Prevent FTBFS under g++ 4.x due to extra namespace qualifier

[synfig.git] / synfig-studio / trunk / Makefile.am

diff --git a/synfig-studio/trunk/Makefile.am b/synfig-studio/trunk/Makefile.am
index 6e648d8..d0e25d0 100644 (file)
--- a/synfig-studio/trunk/Makefile.am
+++ b/synfig-studio/trunk/Makefile.am
@@ -6,7 +6,7 @@ MAINTAINERCLEANFILES=config/ltmain.sh config/config.guess config/config.sub conf
 
 SUBDIRS=src images
 
-EXTRA_DIST=COPYING TODO macosxbuild.sh win32build.sh win32inst.nsi.in bootstrap config/package config/depcomp config/cxx_macros.m4 @PACKAGE_TARNAME@-@VERSION@.spec config/project.spec.in config/build.cfg config/ETL.m4
+EXTRA_DIST=COPYING TODO pkg-info/macosx/studio-resources/InstallationCheck config/subs.m4 macosxbuild.sh win32build.sh win32inst.nsi.in bootstrap config/package config/depcomp config/cxx_macros.m4 @PACKAGE_TARNAME@-@VERSION@.spec config/project.spec.in config/build.cfg config/ETL.m4
 
 # Desktop entry
 #desktopdir              = $(datadir)/gnome/apps/Graphics
@@ -73,20 +73,23 @@ $(srcdir)/configure:  $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENC
 win32inst.nsi: $(srcdir)/win32inst.nsi.in
        ./config.status win32inst.nsi
 
-
-#if WIN32_PKG  
-package: all win32inst.nsi
-#      convert images/about_dialog.png images/about_dialog.bmp
+package-win32: all win32inst.nsi
+       convert images/installer_logo.png images/installer_logo.bmp
        make -C images sif_icon.ico
        makensis win32inst.nsi
-#else
-#if MACOSX_PKG
-package: all pkg-info/macosx/synfig-studio.info
+
+package-osx: all pkg-info/macosx/synfig-studio.info
        [ -d pkg_root ] && $(RMDIR) pkg_root || true
+       convert images/installer_logo_osx.png $(srcdir)/pkg-info/macosx/studio-resources/background.tif
        make install prefix="`pwd`/pkg_root"
        $(srcdir)/config/package pkg_root pkg-info/macosx/synfig-studio.info -r $(srcdir)/pkg-info/macosx/studio-resources
-#endif
-#endif
+if WIN32_PKG   
+package: package-win32
+else
+if MACOSX_PKG
+package: package-osx
+endif
+endif
 
 html: .doc_stamp