Currently, there is no WUtil.pc file so that WINGs developers can use
pkg-config to compile programs using the WINGs utility library. This patch
fixes this, and such a file is created by make, just like WINGs.pc and
wrlib.pc.
In addition, the WUtil.pc file has been added to .gitignore and included in
the debian libwings-dev package.
---
.gitignore | 1 +
WINGs/Makefile.am | 13 +++++++++++--
debian/libwings-dev.install | 1 +
3 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/.gitignore b/.gitignore
index 77fee96..2dc2860 100644
--- a/.gitignore
+++ b/.gitignore
@@ -81,6 +81,7 @@ WPrefs.app/WPrefs
# These files are generated from make rules
wrlib/wrlib.pc
WINGs/WINGs.pc
+WINGs/WUtil.pc
WindowMaker/Defaults/WMRootMenu
WindowMaker/Defaults/WMState
diff --git a/WINGs/Makefile.am b/WINGs/Makefile.am
index 3dac104..e70988d 100644
--- a/WINGs/Makefile.am
+++ b/WINGs/Makefile.am
@@ -94,7 +94,7 @@ AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\"
-DRESOURCE_PATH=\"$(datadir)/WINGs\" \
@XFTFLAGS@ @HEADER_SEARCH_PATH@
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = WINGs.pc
+pkgconfig_DATA = WINGs.pc WUtil.pc
DISTCLEANFILES = $(pkgconfig_DATA) get-wings-flags get-wutil-flags
@@ -103,7 +103,7 @@ WINGs.pc: Makefile
@echo 'Name: WINGs' > $@
@echo 'Description: Small widget set with the NeXTStep(TM) look and
feel' >> $@
@echo 'Version: $(VERSION)' >> $@
- @echo 'Requires: wrlib' >> $@
+ @echo 'Requires: wrlib WUtil' >> $@
@echo 'Libs: $(lib_search_path) -lWINGs' >> $@
@echo 'Libs.private: $(XFTLIBS) $(XLIBS) -lm $(INTLIBS)' >> $@
@echo 'Cflags: $(inc_search_path)' >> $@
@@ -118,6 +118,15 @@ get-wings-flags: get-wings-flags.in Makefile
-e 's#$${XLIBS}#$(XLIBS)#;' < $(abs_srcdir)/get-wings-flags.in
> $@
@chmod 755 $@
+WUtil.pc: Makefile
+ @echo "Generating $@"
+ @echo 'Name: WUtil' > $@
+ @echo 'Description: Utility library for WINGs' >> $@
+ @echo 'Version: $(VERSION)' >> $@
+ @echo 'Libs: -L$(libdir) -lWUtil' >> $@
+ @echo 'Libs.private: $(INTLIBS)' >> $@
+ @echo 'Cflags: -I$(includedir)' >> $@
+
get-wutil-flags: get-wutil-flags.in Makefile
@echo "Generating $@"
@$(SED) -e 's#$${includedir}#$(includedir)#;' \
diff --git a/debian/libwings-dev.install b/debian/libwings-dev.install
index 475aa09..62f0016 100644
--- a/debian/libwings-dev.install
+++ b/debian/libwings-dev.install
@@ -2,6 +2,7 @@ usr/include/WINGs/WUtil.h
usr/include/WINGs/WINGs.h
usr/include/WINGs/WINGsP.h
usr/lib/pkgconfig/WINGs.pc
+usr/lib/pkgconfig/WUtil.pc
usr/lib/libWINGs.a
usr/lib/libWUtil.a
usr/lib/libWUtil.so
--
1.9.1
--
To unsubscribe, send mail to [email protected].
