Move gtk-config to gtk-config-2.0 move gtk_.m4 to gtk-2.0.m4

[~andy/gtk] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 21d1119b8fa65d01f6ddad76729b6813dac61834..d5ae251f4f93d2d0606a308cb62188823cb90929 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,21 +1,47 @@
-## Process this file with automake to produce Makefile.in
+## Makefile.am for GTK+
 
-SRC_SUBDIRS = glib gdk gtk
-SUBDIRS = $(SRC_SUBDIRS) docs
+SRC_SUBDIRS = gdk-pixbuf gdk modules gtk demos
+SUBDIRS = po $(SRC_SUBDIRS) docs
 
-bin_SCRIPTS = gtk-config
+bin_SCRIPTS = gtk-config-2.0
 
-EXTRA_DIST =   \
-       gtk+.spec       \
-        gtk.m4          \
-       makecopyright   \
-       TODO            \
+# require automake 1.4
+AUTOMAKE_OPTIONS = 1.4
+
+EXTRA_DIST =                   \
+       HACKING                 \
+       gtk+.spec.in            \
+        gtk-2.0.m4             \
+       makecopyright           \
+       TODO                    \
+       TODO.xml                \
+       NEWS.pre-1-0            \
        ChangeLog.pre-1-0       \
+       ChangeLog.pre-1-2       \
+       README.cvs-commits      \
+       README.win32            \
+       README.nanox            \
+       intl/libgettext.h       \
+       intl/po2tbl.sed.in      \
        examples/aspectframe/Makefile  \
        examples/aspectframe/aspectframe.c  \
+       examples/Makefile  \
+       examples/README.1ST  \
+       examples/extract.awk  \
+       examples/extract.sh  \
+       examples/arrow/Makefile \
+       examples/arrow/arrow.c  \
+       examples/base/Makefile  \
+       examples/base/base.c  \
+       examples/buttonbox/Makefile \
+       examples/buttonbox/buttonbox.c  \
        examples/buttons/Makefile  \
        examples/buttons/buttons.c  \
        examples/buttons/info.xpm  \
+       examples/calendar/Makefile  \
+       examples/calendar/calendar.c  \
+       examples/clist/Makefile  \
+       examples/clist/clist.c  \
        examples/entry/Makefile  \
        examples/entry/entry.c  \
        examples/eventbox/Makefile  \
@@ -30,18 +56,19 @@ EXTRA_DIST =        \
        examples/helloworld/helloworld.c  \
        examples/helloworld2/Makefile  \
        examples/helloworld2/helloworld2.c  \
+       examples/label/Makefile \
+       examples/label/label.c  \
        examples/list/Makefile  \
        examples/list/list.c  \
        examples/menu/Makefile  \
        examples/menu/menu.c  \
-       examples/menu/menufactory.c  \
-       examples/menu/menufactory.h  \
-       examples/menu/mfmain.c  \
-       examples/menu/mfmain.h  \
+       examples/menu/itemfactory.c  \
        examples/notebook/Makefile  \
        examples/notebook/notebook.c  \
        examples/packbox/Makefile  \
        examples/packbox/packbox.c  \
+       examples/packer/Makefile  \
+       examples/packer/pack.c  \
        examples/paned/Makefile  \
        examples/paned/paned.c  \
        examples/pixmap/Makefile  \
@@ -50,10 +77,14 @@ EXTRA_DIST =        \
        examples/progressbar/progressbar.c  \
        examples/radiobuttons/Makefile  \
        examples/radiobuttons/radiobuttons.c  \
+       examples/rangewidgets/Makefile  \
+       examples/rangewidgets/rangewidgets.c  \
        examples/rulers/Makefile  \
        examples/rulers/rulers.c  \
        examples/scribble-simple/Makefile  \
        examples/scribble-simple/scribble-simple.c  \
+       examples/scribble-xinput/Makefile       \
+       examples/scribble-xinput/scribble-xinput.c      \
        examples/scrolledwin/Makefile  \
        examples/scrolledwin/scrolledwin.c  \
        examples/selection/Makefile  \
@@ -63,19 +94,37 @@ EXTRA_DIST =        \
        examples/statusbar/statusbar.c  \
        examples/table/Makefile  \
        examples/table/table.c  \
+       examples/text/Makefile  \
+       examples/text/text.c  \
        examples/tictactoe/Makefile  \
        examples/tictactoe/tictactoe.c  \
        examples/tictactoe/tictactoe.h  \
        examples/tictactoe/ttt_test.c  \
+       examples/tree/Makefile  \
+       examples/tree/tree.c  \
        examples/wheelbarrow/Makefile  \
        examples/wheelbarrow/wheelbarrow.c  \
+       examples/fixed/fixed.c  \
+       examples/fixed/Makefile  \
+       examples/frame/frame.c  \
+       examples/frame/Makefile  \
+       examples/spinbutton/spinbutton.c  \
+       examples/spinbutton/Makefile  \
        examples/find-examples.sh
 
+dist-hook: gtk+.spec
+       if test -e $(srcdir)/INSTALL.in && test -e $(srcdir)/README.in ; then \
+            CONFIG_FILES="INSTALL:$(srcdir)/INSTALL.in README:$(srcdir)/README.in" \
+            CONFIG_HEADERS= \
+            $(SHELL) config.status \
+            && cp INSTALL README $(distdir) ; \
+       fi \
+       && cp gtk+.spec $(distdir)
 
 m4datadir = $(datadir)/aclocal
-m4data_DATA = gtk.m4
+m4data_DATA = gtk-2.0.m4
 
-.PHONY: files populate checkin release
+.PHONY: files release sanity snapshot
 
 files:
        @files=`ls $(DISTFILES) 2> /dev/null `; for p in $$files; do \
@@ -88,13 +137,13 @@ files:
          done; \
        done
 
-populate:
-       @echo "populating project"
-       @files=`$(MAKE) files | grep -v "make\[[1-9]\]"`; prcs populate -d gtk+.prj $$files
+release:
+       rm -rf .deps */.deps
+       $(MAKE) distcheck
+
+sanity:
+       ./sanity_check $(VERSION)
 
-checkin: populate
-       @echo "checking in project"
-       @prcs checkin
 
-release:
+snapshot:
        $(MAKE) dist distdir=$(PACKAGE)`date +"%y%m%d"`