Merge pull request #3 from proski/pkgconfig

Minor changes to the build system

6 files changed, 23 insertions, 18 deletions

diff --git a/.gitignore b/.gitignore
index 4b89fd7..a5b8148 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,7 @@
 *~
 aclocal.m4
-AUTHORS
 autom4te.cache/
-ChangeLog
+compile
 config_ac.h
 config_ac-h.in
 config.c
@@ -22,8 +21,6 @@ ltmain.sh
 Makefile
 Makefile.in
 missing
-NEWS
 *.o
-README
 stamp-h1
 tests/paintertest
diff --git a/bootstrap b/bootstrap
index 49aeefe..be61972 100755
--- a/bootstrap
+++ b/bootstrap
@@ -28,9 +28,4 @@ then
   exit 1
 fi
 
-touch configure.ac
-touch NEWS
-touch AUTHORS
-touch README
-touch ChangeLog
 autoreconf -fvi
diff --git a/configure.ac b/configure.ac
index 3336c1a..dc1bd10 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,13 +25,14 @@ fi
 pkgconfigdir=${libdir}/pkgconfig
 AC_SUBST(pkgconfigdir)
 
-AC_CONFIG_FILES([Makefile
-                 src/Makefile
-                 include/Makefile
-                 pkgconfig/Makefile
-                 tests/Makefile
-])
-
-AC_OUTPUT([pkgconfig/libpainter.pc
+AC_CONFIG_FILES([
+  Makefile
+  include/Makefile
+  pkgconfig/libpainter.pc
+  pkgconfig/libpainter-uninstalled.pc
+  pkgconfig/Makefile
+  src/Makefile
+  tests/Makefile
 ])
 
+AC_OUTPUT
diff --git a/pkgconfig/.gitignore b/pkgconfig/.gitignore
new file mode 100644
index 0000000..b936527
--- /dev/null
+++ b/pkgconfig/.gitignore
@@ -0,0 +1,2 @@
+libpainter.pc
+libpainter-uninstalled.pc
diff --git a/pkgconfig/libpainter-uninstalled.pc.in b/pkgconfig/libpainter-uninstalled.pc.in
new file mode 100644
index 0000000..9e4fed9
--- /dev/null
+++ b/pkgconfig/libpainter-uninstalled.pc.in
@@ -0,0 +1,10 @@
+abs_top_srcdir=@abs_top_srcdir@
+abs_top_builddir=@abs_top_builddir@
+includedir=${abs_top_srcdir}/include
+libdir=${abs_top_builddir}/src
+
+Name: libpainter
+Description: Library for manipulating memory bitmaps.
+Version: @PACKAGE_VERSION@
+Libs: -L${libdir} -lpainter
+Cflags: -I${includedir}
diff --git a/pkgconfig/libpainter.pc.in b/pkgconfig/libpainter.pc.in
index 4851d76..d6cd445 100644
--- a/pkgconfig/libpainter.pc.in
+++ b/pkgconfig/libpainter.pc.in
@@ -5,6 +5,6 @@ includedir=@includedir@
 
 Name: libpainter
 Description: Library for manipulating memory bitmaps.
-Version: 0.1.0
+Version: @PACKAGE_VERSION@
 Libs: -L${libdir} -lpainter
 Cflags: -I${includedir}