From 1b2db7bfede195cf0fc49899886a5e395229357f Mon Sep 17 00:00:00 2001
From: Nicola Fontana <nicola@localhost.localdomain>
Date: Sat, 20 Feb 2010 09:01:09 +0100
Subject: [PATCH] [build] Moved adg.pc.in under adg/

The adg pkg-config file belongs to the ADG library, so it has been moved
accordingly.
---
 .gitignore                 | 1 -
 Makefile.am                | 3 ---
 adg/.gitignore             | 1 +
 adg/Makefile.am            | 6 +++++-
 adg.pc.in => adg/adg.pc.in | 0
 configure.ac               | 2 +-
 6 files changed, 7 insertions(+), 6 deletions(-)
 rename adg.pc.in => adg/adg.pc.in (100%)

diff --git a/.gitignore b/.gitignore
index b934ea8f..db9e6a47 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,7 +19,6 @@ Makefile.in
 /libtool
 /stamp-h*
 /config.h
-/adg.pc
 .deps/
 Makefile
 
diff --git a/Makefile.am b/Makefile.am
index 5e3b38c5..3b9ca740 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,6 @@ EXTRA_DIST=			COPYING \
 				INSTALL \
 				THANKS \
 				adg.doap \
-				adg.pc.in \
 				$(BUILT_SOURCES)
 
 SUBDIRS=			cpml \
@@ -30,8 +29,6 @@ SUBDIRS=			cpml \
 				po-properties \
 				tests
 
-pkgconfigdir=			$(libdir)/pkgconfig
-pkgconfig_DATA =		adg.pc
 
 # Creating ChangeLog files from git log:
 # idea stolen from cairo/build/Makefile.am.changelog
diff --git a/adg/.gitignore b/adg/.gitignore
index 37379c4c..334c64a2 100644
--- a/adg/.gitignore
+++ b/adg/.gitignore
@@ -1,3 +1,4 @@
+/adg.pc
 /adg-type-builtins.c
 /adg-type-builtins.h
 /adg-marshal.c
diff --git a/adg/Makefile.am b/adg/Makefile.am
index 315b29df..9152d552 100644
--- a/adg/Makefile.am
+++ b/adg/Makefile.am
@@ -12,6 +12,7 @@ AM_LDFLAGS=			@ADG_LIBS@
 
 
 # file groups
+pkgconfig_file=			adg.pc
 h_sources=			adg.h \
 				adg-adim.h \
 				adg-alignment.h \
@@ -125,7 +126,7 @@ c_sources=			adg-adim.c \
 				adg-util.c
 built_c_sources=		$(builddir)/adg-type-builtins.c \
 				$(builddir)/adg-marshal.c
-EXTRA_DIST=			adg-type-builtins.c.mkenums \
+template_sources=		adg-type-builtins.c.mkenums \
 				adg-type-builtins.h.mkenums \
 				adg-marshal.genmarshal
 if HAVE_GTK2
@@ -136,6 +137,9 @@ endif
 
 
 # targets
+pkgconfig_DATA=			$(pkgconfig_file)
+EXTRA_DIST=			$(pkgconfig_file).in \
+				$(template_sources)
 BUILT_SOURCES=			$(built_h_sources) \
 				$(built_private_h_sources)
 #				built_c_sources are properly tracked
diff --git a/adg.pc.in b/adg/adg.pc.in
similarity index 100%
rename from adg.pc.in
rename to adg/adg.pc.in
diff --git a/configure.ac b/configure.ac
index 8372acf2..69b57431 100644
--- a/configure.ac
+++ b/configure.ac
@@ -111,10 +111,10 @@ AC_SUBST([ADG_LIBS])
 SHAVE_INIT([build],[enable])
 AC_CONFIG_FILES([build/shave
                  build/shave-libtool
-                 adg.pc
                  Makefile
                  cpml/cpml.pc
                  cpml/Makefile
+                 adg/adg.pc
                  adg/Makefile
                  demo/Makefile
                  po/Makefile.in
-- 
2.11.4.GIT