X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2FMakefile.am;h=af7326cffd8b10114b2317deb5f08a7f32f9f6e0;hb=990f7bb7694e0472ed6ad165e0724864539071cd;hp=405b2af267ca46d713956c05301f69f6f4a68d8f;hpb=d3ff7913910f1c252525ca1f3bfa486f9845cc8a;p=synfig.git

diff --git a/synfig-studio/trunk/Makefile.am b/synfig-studio/trunk/Makefile.am
index 405b2af..af7326c 100644
--- a/synfig-studio/trunk/Makefile.am
+++ b/synfig-studio/trunk/Makefile.am
@@ -1,19 +1,56 @@
-# $Header: /opt/voria/cvs/studio/Makefile.am,v 1.3 2005/03/24 21:40:05 darco Exp $
+# $Id$
+
+MAINTAINERCLEANFILES = \
+	COPYING \
+	INSTALL \
+	config/ltmain.sh \
+	doxygen.cfg \
+	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
+
+SUBDIRS = \
+	build_tools \
+	src \
+	images \
+	po
+
+EXTRA_DIST = \
+	COPYING \
+	TODO \
+	m4/subs.m4 \
+	doxygen.cfg.in \
+	doxygen.cfg \
+	macosxbuild.sh \
+	win32build.sh \
+	win32inst.nsi.in \
+	config/package \
+	config/depcomp \
+	m4/cxx_macros.m4 \
+	m4/ETL.m4 \
+	ChangeLog.old \
+	synfigstudio.xml.in \
+	synfigstudio-thumbnailer.schemas.in
 
-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
-
-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
 
 # Desktop entry
-#desktopdir              = $(datadir)/gnome/apps/Graphics
-desktopdir              = $(prefix)/share/applications
-desktop_DATA            = synfigstudio.desktop
-#desktop_in_files        = synfigstudio.desktop.in
-#desktop_DATA            = $(desktop_in_files:.desktop.in=.desktop)
+desktopdir = $(prefix)/share/applications
+desktop_DATA = synfigstudio.desktop
 
 # @INTLTOOL_DESKTOP_RULE@
 
@@ -24,8 +61,8 @@ mime_DATA            = synfigstudio.keys synfigstudio.mime
 icondir                 = $(datadir)/pixmaps
 icon_DATA               = images/synfig_icon.png images/sif_icon.png
 
+ACLOCAL_AMFLAGS=-I m4
 
-CVS=cvs
 GREP=grep
 PRINTF=printf
 SH=sh
@@ -37,14 +74,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
@@ -55,12 +94,6 @@ stats:
 	-@du -hcs $(shell find $(top_srcdir)/src -name '*.[ch]*' | $(GREP) -v libavcodec) | $(GREP) total
 	-@echo 
 
-#tagstable:
-#	$(CVS) tag -F stable
-
-#tagrelease:
-#	$(CVS) tag -F @PACKAGE_TARNAME@_@VERSION_MAJ@_@VERSION_MIN@_@VERSION_REV@
-
 listfixmes:
 	-@echo
 	-@echo  -- List of pending FIXMEs
@@ -77,19 +110,17 @@ listhacks:
 
 run: check
 
-$(srcdir)/configure:  $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-	$(srcdir)/bootstrap
-
 .doc_stamp: doxygen.cfg
 	$(DOXYGEN) doxygen.cfg
 	touch .doc_stamp
 
-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