X-Git-Url: http://git.nomeata.de/?p=vte.git;a=blobdiff_plain;f=Makefile.am;h=ffc177245515750cc06dbb3725555ce312588fbe;hp=34d7bd4c27f78152b414e42543889bd6361fbd92;hb=606ae4edb1721ea7643b0e2439a6d8fc2b6469a2;hpb=e1bd736274af19101cb07f72a56306e6d0ef5393

diff --git a/Makefile.am b/Makefile.am
index 34d7bd4c..ffc17724 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,50 +1,36 @@
-SUBDIRS = src python termcaps po doc
-EXTRA_DIST = MAINTAINERS HACKING vte.spec vte.pc.in vte-uninstalled.pc.in \
-	     intltool-extract.in intltool-merge.in intltool-update.in
-DISTCLEANFILES = intltool-extract intltool-merge intltool-update
+SUBDIRS = src termcaps po doc perf
 
-if BUILD_GNOME_PTY_HELPER
-SUBDIRS += gnome-pty-helper
+if HAVE_GTK_2
+SUBDIRS += python
 endif
 
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = vte.pc
-
-CVSTAG=$(shell echo $(PACKAGE)-$(VERSION) | sed 's,[\.\-],_,g')
+EXTRA_DIST = \
+	MAINTAINERS \
+	HACKING \
+	autogen.sh \
+	ChangeLog.pre-git
 
-forcetag:
-	cvs tag -cFR $(CVSTAG) .
+DISTCLEANFILES =
 
-reallytag:
-	cvs tag -cR $(CVSTAG) .
-
-up:
-	cvs up -dP
-
-tag:
-	$(top_srcdir)/autogen.sh
-	$(MAKE) reallytag
+if BUILD_GNOME_PTY_HELPER
+SUBDIRS += gnome-pty-helper
+endif
 
-archive:
-	root=`cat $(top_srcdir)/CVS/Root` ; \
-	repo=`cat $(top_srcdir)/CVS/Repository` ; \
-	tmpdir=`mktemp -d /tmp/$(PACKAGE)-cvsXXXXXX` ; \
-	dir=`pwd` ; \
-	cd $$tmpdir ; \
-	cvs -d $$root export -r $(CVSTAG) $$repo ; \
-	cd $$tmpdir/$$repo ; \
-	./autogen.sh ; \
-	make dist ; \
-	cp $(PACKAGE)-$(VERSION).tar.gz $$dir/ ; \
-	rpmbuild -tb $(PACKAGE)-$(VERSION).tar.gz || true ; \
-	rm -fr $$tmpdir
+if ENABLE_GLADE_CATALOGUE
+SUBDIRS += glade
+endif
 
-srpm: $(top_srcdir)/$(PACKAGE)-$(VERSION).tar.gz
-	rpmbuild -ts $(top_srcdir)/$(PACKAGE)-$(VERSION).tar.gz
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = vte$(VTE_PC_VERSION).pc
 
-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
+DISTCHECK_CONFIGURE_FLAGS = \
+	--enable-gtk-doc \
+	--disable-introspection \
+	--disable-silent-rules \
+	--with-gtk=2.0
 
 MAINTAINERCLEANFILES = \
+		ChangeLog \
 		$(srcdir)/INSTALL \
 		$(srcdir)/aclocal.m4 \
 		$(srcdir)/autoscan.log \
@@ -64,3 +50,15 @@ MAINTAINERCLEANFILES = \
 		$(srcdir)/gtk-doc.make \
 		$(srcdir)/po/Makefile.in.in \
 		`find "$(srcdir)" -type f -name Makefile.in -print`
+
+# Build ChangeLog from GIT  history
+ChangeLog:
+	$(AM_V_GEN) if test -d $(top_srcdir)/.git; then \
+		GIT_DIR="$(top_srcdir)/.git" git log --stat > $@; \
+	fi
+
+dist: ChangeLog
+
+.PHONY: ChangeLog
+
+-include $(top_srcdir)/git.mk