Put the pkg-config scripts back to the correct pkg-config syntax

[~andy/gtk] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index af444c54e2dba364e81eed3ccda51526487b4696..eb9a24f29757815dc0edcfd9b84b24123261a025 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,19 +1,26 @@
-## Process this file with automake to produce Makefile.in
+## Makefile.am for GTK+
 
-SRC_SUBDIRS = gdk gtk
-SUBDIRS = po $(SRC_SUBDIRS) docs
+SRC_SUBDIRS = gdk-pixbuf gdk modules gtk demos
+SUBDIRS = po $(SRC_SUBDIRS) docs build
 
-bin_SCRIPTS = gtk-config
+bin_SCRIPTS = gtk-config-2.0
 
-EXTRA_DIST =   \
-       HACKING         \
-       gtk+.spec       \
-        gtk.m4          \
-       makecopyright   \
-       TODO            \
-       NEWS.pre-1-0    \
+# 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  \
@@ -22,13 +29,17 @@ EXTRA_DIST =        \
        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/gcalendar.c  \
+       examples/calendar/calendar.c  \
        examples/clist/Makefile  \
        examples/clist/clist.c  \
        examples/entry/Makefile  \
@@ -45,6 +56,8 @@ 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  \
@@ -70,6 +83,8 @@ EXTRA_DIST =  \
        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  \
@@ -89,7 +104,6 @@ EXTRA_DIST = \
        examples/tree/tree.c  \
        examples/wheelbarrow/Makefile  \
        examples/wheelbarrow/wheelbarrow.c  \
-       examples/colorsel/colorsel.c  \
        examples/fixed/fixed.c  \
        examples/fixed/Makefile  \
        examples/frame/frame.c  \
@@ -98,9 +112,20 @@ EXTRA_DIST =        \
        examples/spinbutton/Makefile  \
        examples/find-examples.sh
 
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA= gdk-pixbuf-2.0.pc gdk-2.0.pc gtk+-2.0.pc
+
+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 release sanity snapshot
 
@@ -124,4 +149,4 @@ sanity:
 
 
 snapshot:
-       $(MAKE) dist distdir=$(PACKAGE)`date +"%y%m%d"`
+       $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`