2006-11-14 Michael Dominic Kostrzewa <michael.kostrzewa@nokia.com>

* ./: Moving pkgconfig file to pkgconfig/.

diff --git a/ChangeLog b/ChangeLog
index 936a7e2..a77ecba 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
 2006-11-14  Michael Dominic Kostrzewa  <michael.kostrzewa@nokia.com> 
+       
+       * ./: Moving pkgconfig file to pkgconfig/.
+
+2006-11-14  Michael Dominic Kostrzewa  <michael.kostrzewa@nokia.com> 
 
        * ./: Removing plugins and doc temporarily from the build process.
        Upgrading the autogen.sh and configure.ac.

diff --git a/Makefile.am b/Makefile.am
index ef7880a..28bd044 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = src po
+SUBDIRS = src po pkgconfig
 
 EXTRA_DIST = \
        debian/changelog \
@@ -10,24 +10,14 @@ EXTRA_DIST = \
        debian/hildon-libs0-dbg.install \
        debian/rules
 
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = hildon-libs.pc
-
-MAINTAINERCLEANFILES = \
-       Makefile.in aclocal.m4 configure \
-       config.h.in \
-       ltmain.sh depcomp missing \
-       install-sh config.sub \
-       config.guess intltool-extract.in \
-       intltool-merge.in intltool-update.in  \
-       mkinstalldirs build-stamp configure-stamp \
-       gtk-doc.make
-
-distclean-am: 
-       -rm -rf autom4te.cache 
-       -rm -f config.status config.cache config.log configure.lineno  
-#      -rm -f config.guess config.h.in config.sub configure depcomp
-#      -rm -f install-sh ltmain.sh missing mkinstalldirs Makefile.in aclocal.m4
+MAINTAINERCLEANFILES                   = Makefile.in aclocal.m4 configure              \
+                                         config.h.in compile                           \
+                                         ltmain.sh depcomp missing                     \
+                                         install-sh config.sub                         \
+                                         config.guess intltool-extract.in              \
+                                         intltool-merge.in intltool-update.in          \
+                                         mkinstalldirs build-stamp configure-stamp     \
+                                         gtk-doc.make
 
 deb: dist
        -mkdir debian-build

diff --git a/hildon-libs.pc.in b/hildon-libs.pc.in
deleted file mode 100644 (file)
index 3c7f060..0000000
--- a/hildon-libs.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: hildon-libs
-Description: Hildon widgets library
-Requires: gtk+-2.0 >= @GTK_VERSION@
-Version: @VERSION@
-Libs: -L${libdir} -lhildonwidgets
-Cflags: -I${includedir}

diff --git a/pkgconfig/Makefile.am b/pkgconfig/Makefile.am
new file mode 100644 (file)
index 0000000..dc14d8a
--- /dev/null
+++ b/pkgconfig/Makefile.am
@@ -0,0 +1,5 @@
+MAINTAINERCLEANFILES                   = Makefile.in
+
+pkgconfigdir                           = $(libdir)/pkgconfig
+pkgconfig_DATA                         = hildon-widgets.pc
+

diff --git a/pkgconfig/hildon-libs.pc.in b/pkgconfig/hildon-libs.pc.in
new file mode 100644 (file)
index 0000000..3c7f060
--- /dev/null
+++ b/pkgconfig/hildon-libs.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: hildon-libs
+Description: Hildon widgets library
+Requires: gtk+-2.0 >= @GTK_VERSION@
+Version: @VERSION@
+Libs: -L${libdir} -lhildonwidgets
+Cflags: -I${includedir}