static correct-ness, underscore prefixing of library internal functions

[~andy/gtk] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 6ba3ec04a380e7003aeb78c1dc0b54cb543af13b..adbb7c912711a3eab2b50a7b496ace1bf75ef059 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 ## Makefile.am for GTK+
 
-SRC_SUBDIRS = gdk-pixbuf gdk modules gtk demos contrib
-SUBDIRS = po $(SRC_SUBDIRS) docs build
+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests contrib
+SUBDIRS = po $(SRC_SUBDIRS) docs build m4macros
 
 # require automake 1.4
 AUTOMAKE_OPTIONS = 1.4
@@ -9,7 +9,6 @@ AUTOMAKE_OPTIONS = 1.4
 EXTRA_DIST =                   \
        HACKING                 \
        gtk+.spec.in            \
-        gtk-2.0.m4             \
        makecopyright           \
        TODO                    \
        TODO.xml                \
@@ -20,13 +19,12 @@ EXTRA_DIST =                        \
        README.win32            \
        README.nanox            \
        config.h.win32          \
-       intl/libgettext.h       \
-       intl/po2tbl.sed.in      \
        po/README.tools         \
        po/README.translators   \
        po/desk.pl              \
        po/makefile.mingw       \
        po/update.pl            \
+       po/po2tbl.sed.in        \
        examples/aspectframe/Makefile  \
        examples/aspectframe/aspectframe.c  \
        examples/Makefile  \
@@ -127,15 +125,34 @@ gdk-$(GDKTARGET)-2.0.pc: gdk-2.0.pc
        rm -f gdk-$(GDKTARGET)-2.0.pc && \
        cp gdk-2.0.pc gdk-$(GDKTARGET)-2.0.pc
 
+gtk+-$(GDKTARGET)-2.0-uninstalled.pc: gtk+-2.0-uninstalled.pc
+       rm -f gtk+-$(GDKTARGET)-2.0-uninstalled.pc && \
+       cp gtk+-2.0-uninstalled.pc gtk+-$(GDKTARGET)-2.0-uninstalled.pc
+
+gdk-$(GDKTARGET)-2.0-uninstalled.pc: gdk-2.0-uninstalled.pc
+       rm -f gdk-$(GDKTARGET)-2.0-uninstalled.pc && \
+       cp gdk-2.0-uninstalled.pc gdk-$(GDKTARGET)-2.0-uninstalled.pc
+
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA= gdk-pixbuf-2.0.pc gdk-$(GDKTARGET)-2.0.pc gtk+-$(GDKTARGET)-2.0.pc
 
+DISTCLEANFILES =                               \
+       gtk+-$(GDKTARGET)-2.0.pc                \
+       gdk-$(GDKTARGET)-2.0.pc                 \
+       gtk+-$(GDKTARGET)-2.0-uninstalled.pc    \
+       gdk-$(GDKTARGET)-2.0-uninstalled.pc
+
 ## symlink gdk-2.0.pc and gtk+-2.0.pc to default target for the platform 
 DEFAULT_GDKTARGET=x11
-install-data-local:
+install-data-hook:
        (cd $(DESTDIR)$(pkgconfigdir) && \
+        test -e gdk-$(DEFAULT_GDKTARGET)-2.0.pc && \
+        test -e gtk+-$(DEFAULT_GDKTARGET)-2.0.pc && \
         $(LN_S) -f gdk-$(DEFAULT_GDKTARGET)-2.0.pc gdk-2.0.pc && \
-         $(LN_S) -f gtk+-$(DEFAULT_GDKTARGET)-2.0.pc gtk+-2.0.pc)
+        $(LN_S) -f gtk+-$(DEFAULT_GDKTARGET)-2.0.pc gtk+-2.0.pc) || \
+       (cd $(DESTDIR)$(pkgconfigdir) && \
+        $(LN_S) -f gdk-$(GDKTARGET)-2.0.pc gdk-2.0.pc && \
+        $(LN_S) -f gtk+-$(GDKTARGET)-2.0.pc gtk+-2.0.pc)
 
 dist-hook: gtk+.spec
        if test -e $(srcdir)/INSTALL.in && test -e $(srcdir)/README.in ; then \
@@ -146,13 +163,6 @@ dist-hook: gtk+.spec
        fi \
        && cp gtk+.spec $(distdir)
 
-m4datadir = $(datadir)/aclocal
-m4data_DATA = gtk-2.0.m4
-
-bin_SCRIPTS=gtk-config-2.0
-BUILT_SOURCES=gtk-config-2.0
-gtk-config-2.0: gtk-config-2.0.in
-
 .PHONY: files release sanity snapshot
 
 files: