X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2FMakefile.am;h=bb201ca04f7a9fa0f8678635127062c4892feb34;hb=990f7bb7694e0472ed6ad165e0724864539071cd;hp=4ce94ba19ec72c5b065d6cd28a8bd1902b8a78c5;hpb=a4bf84366f4e937dcc0d46b4fc0c58b9f4e10076;p=synfig.git

diff --git a/synfig-core/trunk/Makefile.am b/synfig-core/trunk/Makefile.am
index 4ce94ba..bb201ca 100644
--- a/synfig-core/trunk/Makefile.am
+++ b/synfig-core/trunk/Makefile.am
@@ -1,19 +1,88 @@
 # $Id$
 
-MAINTAINERCLEANFILES=@PACKAGE_TARNAME@.pc.in @PACKAGE_TARNAME@.tar.gz 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 @PACKAGE_TARNAME@.spec include/etl_profile.h.in libltdl/COPYING.LIB  libltdl/Makefile.in  libltdl/acinclude.m4  libltdl/config-h.in  libltdl/configure.in  libltdl/ltdl.h libltdl/Makefile.am  libltdl/README       libltdl/aclocal.m4    libltdl/configure    libltdl/ltdl.c        libltdl/stamp-h.in
+MAINTAINERCLEANFILES = \
+	COPYING \
+	INSTALL \
+	synfig.pc \
+	synfig-$(VERSION).tar.gz \
+	doxygen.cfg \
+	config/config.guess \
+	config/config.sub \
+	config/ltmain.sh \
+	config/ltmain.sh.orig \
+	config/ltmain.sh.rej \
+	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 \
+	include/etl_profile.h.in \
+	libltdl/COPYING.LIB \
+	libltdl/Makefile.in \
+	libltdl/acinclude.m4 \
+	libltdl/config-h.in \
+	libltdl/configure.in \
+	libltdl/ltdl.h \
+	libltdl/Makefile.am \
+	libltdl/README \
+	libltdl/aclocal.m4 \
+	libltdl/configure \
+	libltdl/ltdl.c \
+	libltdl/stamp-h.in
+
+
+SUBDIRS = \
+	libltdl \
+	src \
+	examples \
+	po
 
 
-SUBDIRS=libltdl src examples
-
 # Install the pkg-config file:
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = @PACKAGE_TARNAME@.pc
-
-bin_SCRIPTS=synfig-config
+pkgconfig_DATA = synfig.pc
+
+bin_SCRIPTS = synfig-config
+
+ACLOCAL_AMFLAGS = -I m4
+
+EXTRA_DIST = \
+	ChangeLog.old \
+	TODO \
+	m4/subs.m4 \
+	config/package \
+	doc/hw-gfx-mapping.txt \
+	win32build.sh \
+	macosxbuild.sh \
+	win32inst.nsi.in \
+	COPYING \
+	config/depcomp \
+	m4/synfig.m4 \
+	m4/cxx_macros.m4 \
+	synfig.kdevprj \
+	synfig-config.in \
+	m4/ETL.m4 \
+	doxygen.cfg.in \
+	doxygen.cfg \
+	synfig.pc.in \
+	m4/pkgconfig.m4 \
+	m4/libxml++.m4 \
+	@PACKAGE_TARNAME@.pc.in \
+	pkg-info/macosx/core-resources/ReadMe.txt \
+	pkg-info/macosx/core-resources/Welcome.txt \
+	pkg-info/macosx/core-resources/install.sh
 
-EXTRA_DIST=TODO config/subs.m4 bootstrap config/package doc/hw-gfx-mapping.txt win32build.sh macosxbuild.sh win32inst.nsi.in COPYING config/depcomp config/synfig.m4 config/cxx_macros.m4 synfig.pbproj/config.h synfig.pbproj/project.pbxproj @PACKAGE_TARNAME@.spec config/project.spec.in config/build.cfg synfig.kdevprj synfig-config.in config/ETL.m4 config/doxygen.cfg.in doxygen.cfg config/pkgconfig.pc.in config/pkgconfig.m4 config/libxml++.m4 @PACKAGE_TARNAME@.pc.in pkg-info/macosx/core-resources/ReadMe.txt pkg-info/macosx/core-resources/Welcome.txt pkg-info/macosx/core-resources/install.sh
 
-CVS=cvs
 GREP=grep
 PRINTF=printf
 SH=sh
@@ -24,12 +93,10 @@ 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)"
 
 stats:
@@ -42,12 +109,9 @@ stats:
 	-@du -hcs $(shell find $(top_srcdir)/src -name '*.[ch]*') | $(GREP) total
 	-@echo 
 
-#tagstable:
-#	$(CVS) tag -F stable
-
-#tagrelease:
-#	$(CVS) tag -F @PACKAGE_TARNAME@_@VERSION_MAJ@_@VERSION_MIN@_@VERSION_REV@
-
+ChangeLog:
+	-svn update
+	svn2cl --include-rev || touch ChangeLog
 
 listfixmes:
 	-@echo
@@ -87,20 +151,14 @@ listwritemes:
 install-bin:
 	make -C src/synfig install-libLTLIBRARIES
 
-win32inst.nsi: $(srcdir)/win32inst.nsi.in
-	./config.status win32inst.nsi
-
-pkg-info/macosx/synfig-core.info: $(srcdir)/pkg-info/macosx/synfig-core.info.in
-	./config.status pkg-info/macosx/synfig-core.info
-
 RMDIR=rm -fr
 
 if WIN32_PKG	
 package: all win32inst.nsi
-	cp -fu `which libHalf-4.dll` src/modules/mod_openexr/.libs/
-	cp -fu `which libIlmImf-4.dll` src/modules/mod_openexr/.libs/
-	cp -fu `which libIlmThread-4.dll` src/modules/mod_openexr/.libs/
-	cp -fu `which libIex-4.dll` src/modules/mod_openexr/.libs/
+	cp -fu `which libHalf-6.dll` src/modules/mod_openexr/.libs/
+	cp -fu `which libIlmImf-6.dll` src/modules/mod_openexr/.libs/
+	cp -fu `which libIlmThread-6.dll` src/modules/mod_openexr/.libs/
+	cp -fu `which libIex-6.dll` src/modules/mod_openexr/.libs/
 	makensis win32inst.nsi
 else
 if MACOSX_PKG
@@ -113,9 +171,6 @@ endif
 
 run: check
 
-$(srcdir)/configure:  $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-	$(srcdir)/bootstrap
-
 .doc_stamp: doxygen.cfg
 	$(DOXYGEN) doxygen.cfg
 	touch .doc_stamp