X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2FMakefile.am;h=0cfe457b0aaa425c9804585331c4519501ae7c91;hb=e19a2d3a5162c6e28cd5912cc0eacf8f9abec14a;hp=eac6458ccff48a7e96468f793269ac12fd7283b6;hpb=d99ab9bfac7af599f39776b25318c1f3f4c6c1c7;p=synfig.git

diff --git a/synfig-studio/trunk/Makefile.am b/synfig-studio/trunk/Makefile.am
index eac6458..0cfe457 100644
--- a/synfig-studio/trunk/Makefile.am
+++ b/synfig-studio/trunk/Makefile.am
@@ -1,6 +1,4 @@
-# $Header: /opt/voria/cvs/studio/Makefile.am,v 1.3 2005/03/24 21:40:05 darco Exp $
-
-AUTOMAKE_OPTIONS=dist-zip dist-shar dist-bzip2
+# $Id$
 
 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
 
@@ -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