From b0063c83c7413435301de060b5faa986ae0068d1 Mon Sep 17 00:00:00 2001 From: dan Date: Fri, 18 Apr 2003 01:15:07 +0000 Subject: [PATCH] added support fo generating pkgconfig files for WINGs, wrlib and wmlib ("Marcelo E. Magallon" ) --- ChangeLog | 2 ++ WINGs/Makefile.am | 12 ++++++++++++ configure.ac | 26 ++++++++++++++++++++++++++ wmlib/Makefile.am | 11 +++++++++++ wrlib/Makefile.am | 12 +++++++++++- 5 files changed, 62 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index c0a6122e..ce95a65b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -78,6 +78,8 @@ Changes since version 0.80.2: - Fixed the problem with the root menu code changing the locale setting as a side effect of loading a localized menu - Fixed e memory leak in the code that reads a localized root menu +- Added support for generating pkgconfig files for WINGS, wmlib and wrlib. + ("Marcelo E. Magallon" ) Changes since version 0.80.1: diff --git a/WINGs/Makefile.am b/WINGs/Makefile.am index bcf22541..49855a81 100644 --- a/WINGs/Makefile.am +++ b/WINGs/Makefile.am @@ -115,3 +115,15 @@ INCLUDES = -I$(top_srcdir)/WINGs/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src wcolorpanel.o: wcolorpanel.c $(COMPILE) -c -DRGBTXT="\"@X_LIBRARY_PATH@/X11/rgb.txt\"" $< + +DISTCLEANFILES = WINGs.pc + +install-exec-local: + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(libdir)/pkgconfig + @list='WINGs.pc'; for p in $$list; do \ + if test -f $$p; then \ + echo "$(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/pkgconfig/"; \ + $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/pkgconfig/; \ + else :; fi; \ + done diff --git a/configure.ac b/configure.ac index 7f03bd8f..278dd5bc 100644 --- a/configure.ac +++ b/configure.ac @@ -917,6 +917,14 @@ done EOF +cat < wrlib/wrlib.pc +Name: wrlib +Description: Image manipulation and conversion library +Version: $VERSION +Libs: $lib_search_path -lwraster $GFXLIBS $XLIBS -lm +Cflags: $inc_search_path +EOF + cat <get-wings-flags #!/bin/sh @@ -953,6 +961,15 @@ done EOF +cat < WINGs/WINGs.pc +Name: WINGs +Description: Small widget set with the NeXTStep(TM) look and feel +Version: $VERSION +Requires: wrlib +Libs: $lib_search_path -lWINGs $XFTLIBS $XLIBS -lm $NETLIBS $INTLIBS +Cflags: $inc_search_path +EOF + cat <get-wutil-flags #!/bin/sh @@ -989,6 +1006,15 @@ done EOF +cat < wmlib/wmlib.pc +Name: wmlib +Description: FIXME: What do I write here? +Version: $VERSION +Requires: wrlib +Libs: $lib_search_path -lWUtil $NETLIBS $INTLIBS +Cflags: $inc_search_path +EOF + sed 's/#lp#/[/g' get-wraster-flags | sed 's/#rp#/]/g' > wrlib/get-wraster-flags sed 's/#lp#/[/g' get-wings-flags | sed 's/#rp#/]/g' > WINGs/get-wings-flags sed 's/#lp#/[/g' get-wutil-flags | sed 's/#rp#/]/g' > WINGs/get-wutil-flags diff --git a/wmlib/Makefile.am b/wmlib/Makefile.am index c29801a8..34cc11e0 100644 --- a/wmlib/Makefile.am +++ b/wmlib/Makefile.am @@ -15,3 +15,14 @@ libWMaker_a_SOURCES = \ app.h \ menu.h +DISTCLEANFILES = wmlib.pc + +install-exec-local: + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(libdir)/pkgconfig + @list='wmlib.pc'; for p in $$list; do \ + if test -f $$p; then \ + echo "$(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/pkgconfig/"; \ + $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/pkgconfig/; \ + else :; fi; \ + done diff --git a/wrlib/Makefile.am b/wrlib/Makefile.am index 0ec8f8db..5ac7b583 100644 --- a/wrlib/Makefile.am +++ b/wrlib/Makefile.am @@ -79,4 +79,14 @@ testdraw_LDADD = $(LIBLIST) libwraster_la_LIBADD = @ALLOCA@ @LIBRARY_SEARCH_PATH@ @GFXLIBS@ @XLIBS@ -lm - +DISTCLEANFILES = wrlib.pc + +install-exec-local: + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(libdir)/pkgconfig + @list='wrlib.pc'; for p in $$list; do \ + if test -f $$p; then \ + echo "$(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/pkgconfig/"; \ + $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/pkgconfig/; \ + else :; fi; \ + done -- 2.11.4.GIT