X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2FMakefile.am;h=694697c35c241ec02c9a96d5c60ec026d546e735;hb=e8a065f2385c219c511b57dac52786120bfa097d;hp=4fdd09fec2e757ff3873df262b9994a34c8e4c03;hpb=3a3c4bca3a17137bec5d7960560934b91ef4146e;p=synfig.git

diff --git a/synfig-studio/trunk/Makefile.am b/synfig-studio/trunk/Makefile.am
index 4fdd09f..694697c 100644
--- a/synfig-studio/trunk/Makefile.am
+++ b/synfig-studio/trunk/Makefile.am
@@ -1,28 +1,28 @@
-# $Header: /opt/voria/cvs/studio/Makefile.am,v 1.2 2005/01/17 06:25:42 darco Exp $
+# $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
 
-MAINTAINERCLEANFILES=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/package 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=images src
+SUBDIRS=src images
 
-EXTRA_DIST=bootstrap config/depcomp config/cxx_macros.m4 @PACKAGE_TARNAME@-@VERSION@.spec config/project.spec.in config/build.cfg sinfg.kdevprj config/ETL.m4
+EXTRA_DIST=COPYING 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
 desktopdir              = $(prefix)/share/applications
-desktop_DATA            = sinfgstudio.desktop
-#desktop_in_files        = sinfgstudio.desktop.in
+desktop_DATA            = synfigstudio.desktop
+#desktop_in_files        = synfigstudio.desktop.in
 #desktop_DATA            = $(desktop_in_files:.desktop.in=.desktop)
 
 # @INTLTOOL_DESKTOP_RULE@
 
 mimedir              = $(prefix)/share/mime-info
-mime_DATA            = sinfgstudio.keys sinfgstudio.mime
+mime_DATA            = synfigstudio.keys synfigstudio.mime
 
 # Icon
 icondir                 = $(datadir)/pixmaps
-icon_DATA               = images/sinfg_icon.png images/sif_icon.png
+icon_DATA               = images/synfig_icon.png images/sif_icon.png
 
 
 CVS=cvs
@@ -51,14 +51,14 @@ listfixmes:
 	-@echo
 	-@echo  -- List of pending FIXMEs
 	-@echo
-	-@$(GREP) FIXME -n $(shell find $(top_srcdir) -name '*.[ch]*')
+	-@$(GREP) FIXME -n $(shell find $(top_srcdir) -name '*.[ch]*' | grep -v svn)
 	-@echo
 
 listhacks:
 	-@echo
 	-@echo  -- List of pending HACKs
 	-@echo
-	-@$(GREP) HACK -n $(shell find $(top_srcdir) -name '*.[ch]*')
+	-@$(GREP) HACK -n $(shell find $(top_srcdir) -name '*.[ch]*' | grep -v svn)
 	-@echo
 
 run: check
@@ -70,14 +70,25 @@ $(srcdir)/configure:  $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENC
 	$(DOXYGEN) doxygen.cfg
 	touch .doc_stamp
 
-win32inst.nsi: win32inst.nsi.in
+win32inst.nsi: $(srcdir)/win32inst.nsi.in
 	./config.status win32inst.nsi
 
 installer: all win32inst.nsi
-	convert images/about_dialog.png images/about_dialog.bmp
+#	convert images/about_dialog.png images/about_dialog.bmp
 	make -C images sif_icon.ico
 	makensis win32inst.nsi
 
+#if WIN32_PKG	
+#package: installer
+#else
+#if MACOSX_PKG
+package: all pkg-info/macosx/synfig-studio.info
+	[ -d pkg_root ] && $(RMDIR) pkg_root || true
+	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
+
 html: .doc_stamp
 
 rtf: .doc_stamp