Distribute autogen.sh

[~andy/gtk] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 48620908a1a6164a987fdcc44124825879ce0ace..f87b2da74319d8a579edc2b05b8d7f81c91fe4bd 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,13 @@
 ## Makefile.am for GTK+
 include $(top_srcdir)/Makefile.decl
 
-SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib
+SRC_SUBDIRS = gdk gtk modules demos tests perf
 SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
 
-AUTOMAKE_OPTIONS = 1.7
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 EXTRA_DIST +=                  \
+       autogen.sh              \
        HACKING                 \
        makecopyright           \
        NEWS.pre-1-0            \
@@ -71,8 +71,6 @@ EXTRA_DIST +=                 \
        examples/packbox/packbox.c  \
        examples/paned/Makefile  \
        examples/paned/paned.c  \
-       examples/pixmap/Makefile  \
-       examples/pixmap/pixmap.c  \
        examples/progressbar/Makefile  \
        examples/progressbar/progressbar.c  \
        examples/radiobuttons/Makefile  \
@@ -148,7 +146,7 @@ gdk-$(GDKTARGET)-3.0-uninstalled.pc: gdk-3.0-uninstalled.pc
        cp gdk-3.0-uninstalled.pc gdk-$(GDKTARGET)-3.0-uninstalled.pc
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA= gdk-pixbuf-3.0.pc gdk-$(GDKTARGET)-3.0.pc gtk+-$(GDKTARGET)-3.0.pc gail.pc
+pkgconfig_DATA = gdk-$(GDKTARGET)-3.0.pc gtk+-$(GDKTARGET)-3.0.pc gail-3.0.pc
 
 if OS_UNIX
 pkgconfig_DATA += gtk+-unix-print-3.0.pc
@@ -158,10 +156,10 @@ DISTCLEANFILES =                          \
        gtk+-unix-print-3.0.pc                  \
        gtk+-$(GDKTARGET)-3.0.pc                \
        gdk-$(GDKTARGET)-3.0.pc                 \
-       gail.pc                                 \
+       gail-3.0.pc                             \
        gtk+-$(GDKTARGET)-3.0-uninstalled.pc    \
        gdk-$(GDKTARGET)-3.0-uninstalled.pc     \
-       gail-uninstalled.pc                     \
+       gail-3.0-uninstalled.pc                 \
        config.lt
 
 distclean-local:
@@ -231,7 +229,11 @@ sanity:
 snapshot:
        $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
 
-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-man --disable-rebuilds --enable-introspection
+DISTCHECK_CONFIGURE_FLAGS =            \
+               --enable-gtk-doc        \
+               --enable-man            \
+               --disable-rebuilds      \
+               --enable-introspection
 
 GITIGNOREFILES = \
        po-properties/Makefile.in.in \