Typo: 'writting' -> 'writing'.

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

diff --git a/synfig-studio/trunk/Makefile.am b/synfig-studio/trunk/Makefile.am
index a0ee491..0cfe457 100644 (file)
--- a/synfig-studio/trunk/Makefile.am
+++ b/synfig-studio/trunk/Makefile.am
@@ -1,12 +1,10 @@
-# $Header: /opt/voria/cvs/studio/Makefile.am,v 1.3 2005/03/24 21:40:05 darco Exp $
+# $Id$
 
-AUTOMAKE_OPTIONS=dist-zip dist-shar dist-bzip2
-
-MAINTAINERCLEANFILES=config/ltmain.sh config/config.guess config/config.sub config/ltmain.sh config/install-sh config/mkinstalldirs config/aclocal.m4 config/missing config/texinfo.tex config/depcomp aclocal.m4 config.h.in configure stamp-h.in Makefile.in config.log config.status .doc_stamp .DS_Store @PACKAGE_TARNAME@-@VERSION@.spec
+MAINTAINERCLEANFILES=config/ltmain.sh config/config.guess config/config.sub config/ltmain.sh config/install-sh config/mkinstalldirs config/aclocal.m4 config/missing config/texinfo.tex config/depcomp aclocal.m4 config.h.in configure stamp-h.in Makefile.in config.log config.status .doc_stamp .DS_Store @PACKAGE_TARNAME@.spec
 
 SUBDIRS=src images
 
-EXTRA_DIST=COPYING TODO 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 ChangeLog.old synfigstudio.xml.in synfigstudio-thumbnailer.schemas.in
+EXTRA_DIST=COPYING TODO config/subs.m4 macosxbuild.sh win32build.sh win32inst.nsi.in bootstrap config/package config/depcomp config/cxx_macros.m4 @PACKAGE_TARNAME@.spec config/project.spec.in config/build.cfg config/ETL.m4 ChangeLog.old synfigstudio.xml.in synfigstudio-thumbnailer.schemas.in
 
 # Desktop entry
 #desktopdir              = $(datadir)/gnome/apps/Graphics
@@ -37,14 +35,16 @@ TAG=@PACKAGE_TARNAME@_@VERSION_MAJ@_@VERSION_MIN@_@VERSION_REV@
 
 
 tagstable:
-       -$(SVN) delete $(SVN_REPOSITORY)/tags/stable -m "Stabe Tag: Removing old tag"
-       $(SVN) mkdir $(SVN_REPOSITORY)/tags/stable -m "Stable Tag: Creating new directory"
-       $(SVN) copy $(top_srcdir) $(SVN_REPOSITORY)/tags/stable -m "Stable Tag: Copying everyhting over"
+       -$(SVN) delete $(SVN_REPOSITORY)/tags/stable -m "Stable Tag: Removing old tag"
+       $(SVN) copy $(top_srcdir) $(SVN_REPOSITORY)/tags/stable -m "Stable Tag: Copying everything over"
 
 tagrelease:
-       $(SVN) mkdir $(SVN_REPOSITORY)/tags/$(TAG) -m "Release Tag: Making directory"
        $(SVN) copy $(top_srcdir) $(SVN_REPOSITORY)/tags/$(TAG) -m "Release $(TAG)"
 
+ChangeLog:
+       -svn update
+       svn2cl --include-rev || touch ChangeLog
+
 stats:
        -@echo
        -@echo  -- Stats
@@ -88,8 +88,12 @@ win32inst.nsi: $(srcdir)/win32inst.nsi.in
        ./config.status win32inst.nsi
 
 package-win32: all win32inst.nsi
-       convert images/installer_logo.png images/installer_logo.bmp
-       make -C images sif_icon.ico
+       convert images/installer_logo.png bmp3:images/installer_logo.bmp
+       make -C images sif_icon.ico synfig_icon.ico
+       grep -v -e 'installer_logo' -e 'sif_icon' images/images.nsh >images/images.nsh.tmp
+       grep -v -e 'installer_logo' -e 'sif_icon' images/unimages.nsh >images/unimages.nsh.tmp
+       mv -f images/images.nsh.tmp images/images.nsh
+       mv -f images/unimages.nsh.tmp images/unimages.nsh
        makensis win32inst.nsi
 
 package-osx: all pkg-info/macosx/synfig-studio.info