[Liboil-commit] Makefile.am configure.ac orc-uninstalled.pc.in orc.pc.in orc/Makefile.am

David Schleef ds at kemper.freedesktop.org
Wed May 21 19:16:10 PDT 2008


 Makefile.am           |    8 +++++++-
 configure.ac          |    2 ++
 orc-uninstalled.pc.in |   10 ++++++++++
 orc.pc.in             |   14 ++++++++++++++
 orc/Makefile.am       |    6 +++++-
 5 files changed, 38 insertions(+), 2 deletions(-)

New commits:
commit 294090a6824d337318359dfc3b70a1bcba111c0f
Author: David Schleef <ds at ginger.bigkitten.com>
Date:   Wed May 21 19:15:50 2008 -0700

    [orc] add pkgconfig files and install properly

diff --git a/Makefile.am b/Makefile.am
index a2015ed..c1916fe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,7 @@ EXTRA_DIST = COPYING autogen.sh gtk-doc.make HACKING BUG-REPORTING
 
 DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc
 
-pkgconfig_DATA = liboil-$(LIBOIL_MAJORMINOR).pc
+pkgconfig_DATA = liboil-$(LIBOIL_MAJORMINOR).pc orc-$(LIBOIL_MAJORMINOR).pc
 
 liboil-$(LIBOIL_MAJORMINOR).pc: liboil.pc
 	cp liboil.pc liboil-$(LIBOIL_MAJORMINOR).pc
@@ -15,6 +15,12 @@ liboil-$(LIBOIL_MAJORMINOR).pc: liboil.pc
 liboil-$(LIBOIL_MAJORMINOR)-uninstalled.pc: liboil-uninstalled.pc
 	cp liboil-uninstalled.pc liboil-$(LIBOIL_MAJORMINOR)-uninstalled.pc
 
+orc-$(LIBOIL_MAJORMINOR).pc: orc.pc
+	cp orc.pc orc-$(LIBOIL_MAJORMINOR).pc
+
+orc-$(LIBOIL_MAJORMINOR)-uninstalled.pc: orc-uninstalled.pc
+	cp orc-uninstalled.pc orc-$(LIBOIL_MAJORMINOR)-uninstalled.pc
+
 BUILT_SOURCES=liboil-$(LIBOIL_MAJORMINOR)-uninstalled.pc
 
 CLEANFILES = liboil-$(LIBOIL_MAJORMINOR).pc liboil-$(LIBOIL_MAJORMINOR)-uninstalled.pc
diff --git a/configure.ac b/configure.ac
index 7272749..8e50616 100644
--- a/configure.ac
+++ b/configure.ac
@@ -300,6 +300,8 @@ examples/videoscale/Makefile
 examples/work/Makefile
 liboil-uninstalled.pc
 liboil.pc
+orc-uninstalled.pc
+orc.pc
 ])
 AC_OUTPUT
 
diff --git a/orc-uninstalled.pc.in b/orc-uninstalled.pc.in
new file mode 100644
index 0000000..00e6bad
--- /dev/null
+++ b/orc-uninstalled.pc.in
@@ -0,0 +1,10 @@
+prefix=
+exec_prefix=
+libdir=${pcfiledir}/orc/
+includedir=${pcfiledir}/
+
+Name: orc- at LIBOIL_MAJORMINOR@ uninstalled
+Description: Library of Optimized Inner Loops Runtime Compiler
+Version: @VERSION@
+Libs: -L${libdir} -lorc- at LIBOIL_MAJORMINOR@ @LIBM@ @LIBRT@
+Cflags: -I${includedir}
diff --git a/orc.pc.in b/orc.pc.in
new file mode 100644
index 0000000..2347be7
--- /dev/null
+++ b/orc.pc.in
@@ -0,0 +1,14 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@/orc- at LIBOIL_MAJORMINOR@
+toolsdir=${exec_prefix}/bin
+
+
+Name: orc- at LIBOIL_MAJORMINOR@
+Description: Library of Optimized Inner Loops Runtime Compiler
+Version: @VERSION@
+Libs: -L${libdir} -lorc- at LIBOIL_MAJORMINOR@ @LIBM@ @LIBRT@
+Cflags: -I${includedir}
+
+
diff --git a/orc/Makefile.am b/orc/Makefile.am
index 4d63801..098d0d5 100644
--- a/orc/Makefile.am
+++ b/orc/Makefile.am
@@ -1,5 +1,5 @@
 
-includedir = $(includedir)/orc- at LIBOIL_MAJORMINOR@/orc
+pkgincludedir = $(includedir)/orc- at LIBOIL_MAJORMINOR@/orc
 
 lib_LTLIBRARIES = liborc- at LIBOIL_MAJORMINOR@.la
 
@@ -19,3 +19,7 @@ liborc_ at LIBOIL_MAJORMINOR@_la_SOURCES = \
 	orcopcodes.c \
 	orcprogram-linux.c
 
+pkginclude_HEADERS = \
+	orc.h \
+	orcprogram.h
+


More information about the Liboil-commit mailing list