summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Kerr <jk@ozlabs.org>2006-12-01 15:25:34 +1100
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2006-12-01 16:40:12 +1100
commite65dea139ee4917bb87f51254164317952717586 (patch)
tree6701fe91bd7d080cc129d144bc0c703a5a602328
parent0e9d82417bbb8ce7a1ffa97f403a7698ba7e9a6b (diff)
Install libtwin.pc
The existing twin.pc file was generated, but not installed. This change installs it (as libtwin.pc), and uses the more flexible TWIN_DEP variables. Signed-off-by: Jeremy Kerr <jk@ozlabs.org> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
-rw-r--r--Makefile.am3
-rw-r--r--configure.ac2
-rw-r--r--libtwin.pc.in (renamed from twin.pc.in)6
3 files changed, 7 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am
index cd0febd..57ad4ea 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -59,6 +59,9 @@ pkginclude_HEADERS += twin_png.h
libtwin_la_SOURCES += twin_png.c
endif
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libtwin.pc
+
# demo twin applications
EXTRA_PROGRAMS += twin_demos/xtwin twin_demos/ftwin
noinst_PROGRAMS =
diff --git a/configure.ac b/configure.ac
index 3d7b547..cbbd6b3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -126,4 +126,4 @@ AC_MSG_NOTICE([twin_ttf tool: $twin_ttf])
AC_MSG_NOTICE([linux mouse: $twin_mouse])
AC_OUTPUT([Makefile
- twin.pc])
+ libtwin.pc])
diff --git a/twin.pc.in b/libtwin.pc.in
index 93678ff..0692293 100644
--- a/twin.pc.in
+++ b/libtwin.pc.in
@@ -3,8 +3,8 @@ exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
-Name: twin
+Name: libtwin
Description: Twin window system library
Version: @PACKAGE_VERSION@
-Cflags: -I${includedir} @X_CFLAGS@
-Libs: -L${libdir} -ltwin @X_LIBS@
+Cflags: -I${includedir} @TWIN_DEP_CFLAGS@
+Libs: -L${libdir} -ltwin @TWIN_DEP_LDFLAGS@