gtk/gtkmain.c Use the new

[~andy/gtk] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 0b42c1c0e1ac23f01f67b0fc87703dc975dfc2d4..1ee167e4112ecfa5dcef7f69aa2a8e68fda68924 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,8 @@
 ## Makefile.am for GTK+
 
-SRC_SUBDIRS = gdk-pixbuf gdk modules gtk demos
+SRC_SUBDIRS = gdk-pixbuf gdk modules gtk demos contrib
 SUBDIRS = po $(SRC_SUBDIRS) docs build
 
-bin_SCRIPTS = gtk-config-2.0
-
 # require automake 1.4
 AUTOMAKE_OPTIONS = 1.4
 
@@ -21,8 +19,14 @@ EXTRA_DIST =                 \
        README.cvs-commits      \
        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            \
        examples/aspectframe/Makefile  \
        examples/aspectframe/aspectframe.c  \
        examples/Makefile  \
@@ -112,8 +116,26 @@ EXTRA_DIST =                       \
        examples/spinbutton/Makefile  \
        examples/find-examples.sh
 
+GDKTARGET=@gdktarget@
+
+## Copy .pc files to target-specific names
+gtk+-$(GDKTARGET)-2.0.pc: gtk+-2.0.pc
+       rm -f gtk+-$(GDKTARGET)-2.0.pc && \
+       cp gtk+-2.0.pc gtk+-$(GDKTARGET)-2.0.pc
+
+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
+
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA= gdk-pixbuf.pc gdk-2.0.pc gtk+-2.0.pc
+pkgconfig_DATA= gdk-pixbuf-2.0.pc gdk-$(GDKTARGET)-2.0.pc gtk+-$(GDKTARGET)-2.0.pc
+
+## symlink gdk-2.0.pc and gtk+-2.0.pc to default target for the platform 
+DEFAULT_GDKTARGET=x11
+install-data-local:
+       (cd $(DESTDIR)$(pkgconfigdir) && \
+        $(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)
 
 dist-hook: gtk+.spec
        if test -e $(srcdir)/INSTALL.in && test -e $(srcdir)/README.in ; then \