commit 145693c4e19362d840938f3d37a30f8703e4d394
Author: phantomjinx <p.g.richard...@phantomjinx.co.uk>
Date: Tue Jun 22 23:37:27 2010 +0100
Build configure tweaks
* Add pkgconfig pc file fo libgtkpod
* Fix Makefile of coverweb with change to configure.in
Makefile.am | 6 +++++-
TODO | 6 +++---
configure.in | 1 +
libgtkpod-1.0.pc.in | 11 +++++++++++
plugins/coverweb/Makefile.am | 4 ++--
5 files changed, 22 insertions(+), 6 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 6134a4a..03fd2f4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,13 +2,17 @@
SUBDIRS = libgtkpod src po scripts data doc plugins
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libgtkpod-1.0.pc
+
EXTRA_DIST = \
autogen.sh \
intltool-extract.in \
intltool-merge.in \
intltool-update.in \
TROUBLESHOOTING \
- TODOandBUGS.txt
+ TODOandBUGS.txt \
+ libgtkpod-1.0.pc.in
DISTCLEANFILES = \
intltool-extract \
diff --git a/TODO b/TODO
index 105fcd9..011b76e 100644
--- a/TODO
+++ b/TODO
@@ -92,7 +92,7 @@ Notes on trial build using ubuntu 910
- Install libgda-4.0-dev
-- Investigate the lack of ltmain.sh
-- Change configure.in to signal at the bottom status of webkit
-- pkconfig.pc for libgtkpod
+# Investigate the lack of ltmain.sh
+# Change configure.in to signal at the bottom status of webkit
+#- pkconfig.pc for libgtkpod
diff --git a/configure.in b/configure.in
index 592001f..40cea32 100644
--- a/configure.in
+++ b/configure.in
@@ -289,6 +289,7 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
AC_OUTPUT([
Makefile
+libgtkpod-1.0.pc
src/Makefile
po/Makefile.in
scripts/Makefile
diff --git a/libgtkpod-1.0.pc.in b/libgtkpod-1.0.pc.in
new file mode 100644
index 0000000..e5a358c
--- /dev/null
+++ b/libgtkpod-1.0.pc.in
@@ -0,0 +1,11 @@
+pref...@prefix@
+exec_pref...@exec_prefix@
+libd...@libdir@
+included...@includedir@
+
+Name: libgtkpod
+Description: Library containing core gtk functions for the application gtkpod
+Version: @VERSION@
+Requires: gtk+-2.0 >= 2.8.0, glib-2.0 >= 2.15.0, gmodule-2.0, gthread-2.0 >=
0.14.0, libglade-2.0 >= 2.4.0, libgpod-1.0 >= 0.7.0, libanjuta-1.0 >= 2.30.0,
gdl-1.0 >= 2.26.0
+Libs: -L${libdir} -lgtkpod
+Cflags: -I${includedir}/gtkpod-1.0
diff --git a/plugins/coverweb/Makefile.am b/plugins/coverweb/Makefile.am
index 8e70b89..d7f0c4f 100644
--- a/plugins/coverweb/Makefile.am
+++ b/plugins/coverweb/Makefile.am
@@ -43,7 +43,7 @@ AM_CPPFLAGS = \
-DPACKAGE_DATA_DIR=\"$(datadir)\" \
-DPACKAGE_SRC_DIR=\"$(srcdir)\" \
$(GTKPOD_CFLAGS) \
- $(PLUGIN_COVERWEB_CFLAGS)
+ $(WEBKIT_CFLAGS)
# Plugin sources
libcoverweb_la_SOURCES = plugin.c plugin.h \
@@ -56,7 +56,7 @@ libcoverweb_la_LDFLAGS = $(GTKPOD_PLUGIN_LDFLAGS)
libcoverweb_la_LIBADD = \
$(LIBGTKPOD_LIBS) \
$(LIBANJUTA_LIBS) \
- $(PLUGIN_COVERWEB_LIBS)
+ $(WEBKIT_LIBS)
all-local: create-plugin-links create-ui-link create-glade-link copy-icons-dir
------------------------------------------------------------------------------
ThinkGeek and WIRED's GeekDad team up for the Ultimate
GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the
lucky parental unit. See the prize list and enter to win:
http://p.sf.net/sfu/thinkgeek-promo
_______________________________________________
gtkpod-cvs2 mailing list
gtkpod-cvs2@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
