diff --git a/qse/configure b/qse/configure index 8d01f4a8..f78ce19b 100755 --- a/qse/configure +++ b/qse/configure @@ -21589,7 +21589,7 @@ QSE_PROJECT_AUTHOR="${PACKAGE_BUGREPORT}" QSE_PROJECT_URL="${PACKAGE_URL}" -ac_config_files="$ac_config_files Makefile README include/Makefile include/qse/Makefile include/qse/cmn/Makefile include/qse/awk/Makefile include/qse/sed/Makefile include/qse/xli/Makefile include/qse/http/Makefile lib/Makefile lib/cmn/Makefile lib/awk/Makefile lib/sed/Makefile lib/xli/Makefile lib/http/Makefile cmd/Makefile cmd/awk/Makefile cmd/sed/Makefile cmd/xli/Makefile cmd/http/Makefile samples/Makefile samples/cmn/Makefile samples/awk/Makefile samples/sed/Makefile samples/http/Makefile regress/Makefile regress/awk/Makefile regress/awk/regress.sh regress/sed/Makefile regress/sed/regress.sh doc/Makefile doc/Doxyfile tools/Makefile" +ac_config_files="$ac_config_files Makefile README include/Makefile include/qse/Makefile include/qse/cmn/Makefile include/qse/awk/Makefile include/qse/sed/Makefile include/qse/xli/Makefile include/qse/http/Makefile lib/Makefile lib/cmn/Makefile lib/awk/Makefile lib/sed/Makefile lib/xli/Makefile lib/http/Makefile lib/qsecmn.pc lib/qseawk.pc lib/qsesed.pc lib/qsexli.pc lib/qsehttp.pc cmd/Makefile cmd/awk/Makefile cmd/sed/Makefile cmd/xli/Makefile cmd/http/Makefile samples/Makefile samples/cmn/Makefile samples/awk/Makefile samples/sed/Makefile samples/http/Makefile regress/Makefile regress/awk/Makefile regress/awk/regress.sh regress/sed/Makefile regress/sed/regress.sh doc/Makefile doc/Doxyfile tools/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -22764,6 +22764,11 @@ do "lib/sed/Makefile") CONFIG_FILES="$CONFIG_FILES lib/sed/Makefile" ;; "lib/xli/Makefile") CONFIG_FILES="$CONFIG_FILES lib/xli/Makefile" ;; "lib/http/Makefile") CONFIG_FILES="$CONFIG_FILES lib/http/Makefile" ;; + "lib/qsecmn.pc") CONFIG_FILES="$CONFIG_FILES lib/qsecmn.pc" ;; + "lib/qseawk.pc") CONFIG_FILES="$CONFIG_FILES lib/qseawk.pc" ;; + "lib/qsesed.pc") CONFIG_FILES="$CONFIG_FILES lib/qsesed.pc" ;; + "lib/qsexli.pc") CONFIG_FILES="$CONFIG_FILES lib/qsexli.pc" ;; + "lib/qsehttp.pc") CONFIG_FILES="$CONFIG_FILES lib/qsehttp.pc" ;; "cmd/Makefile") CONFIG_FILES="$CONFIG_FILES cmd/Makefile" ;; "cmd/awk/Makefile") CONFIG_FILES="$CONFIG_FILES cmd/awk/Makefile" ;; "cmd/sed/Makefile") CONFIG_FILES="$CONFIG_FILES cmd/sed/Makefile" ;; diff --git a/qse/configure.ac b/qse/configure.ac index 58f4298d..cc82377c 100644 --- a/qse/configure.ac +++ b/qse/configure.ac @@ -746,6 +746,11 @@ AC_CONFIG_FILES([ lib/sed/Makefile lib/xli/Makefile lib/http/Makefile + lib/qsecmn.pc + lib/qseawk.pc + lib/qsesed.pc + lib/qsexli.pc + lib/qsehttp.pc cmd/Makefile cmd/awk/Makefile cmd/sed/Makefile diff --git a/qse/lib/Makefile.am b/qse/lib/Makefile.am index 2ffe121a..313269ce 100644 --- a/qse/lib/Makefile.am +++ b/qse/lib/Makefile.am @@ -1,2 +1,5 @@ SUBDIRS = cmn sed awk xli http DIST_SUBDIRS = $(SUBDIRS) + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = qsecmn.pc qseawk.pc qsesed.pc qsexli.pc qsehttp.pc diff --git a/qse/lib/Makefile.in b/qse/lib/Makefile.in index 79c5e8de..f9928629 100644 --- a/qse/lib/Makefile.in +++ b/qse/lib/Makefile.in @@ -14,6 +14,7 @@ # PARTICULAR PURPOSE. @SET_MAKE@ + VPATH = @srcdir@ am__make_dryrun = \ { \ @@ -51,7 +52,10 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = lib -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(srcdir)/qseawk.pc.in $(srcdir)/qsecmn.pc.in \ + $(srcdir)/qsehttp.pc.in $(srcdir)/qsesed.pc.in \ + $(srcdir)/qsexli.pc.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \ $(top_srcdir)/m4/ax_check_sign.m4 \ @@ -65,7 +69,8 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/qse/config.h -CONFIG_CLEAN_FILES = +CONFIG_CLEAN_FILES = qsecmn.pc qseawk.pc qsesed.pc qsexli.pc \ + qsehttp.pc CONFIG_CLEAN_VPATH_FILES = AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) @@ -87,6 +92,35 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(pkgconfigdir)" +DATA = $(pkgconfig_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -297,6 +331,8 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = cmn sed awk xli http DIST_SUBDIRS = $(SUBDIRS) +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = qsecmn.pc qseawk.pc qsesed.pc qsexli.pc qsehttp.pc all: all-recursive .SUFFIXES: @@ -330,12 +366,43 @@ $(top_srcdir)/configure: $(am__configure_deps) $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): +qsecmn.pc: $(top_builddir)/config.status $(srcdir)/qsecmn.pc.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +qseawk.pc: $(top_builddir)/config.status $(srcdir)/qseawk.pc.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +qsesed.pc: $(top_builddir)/config.status $(srcdir)/qsesed.pc.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +qsexli.pc: $(top_builddir)/config.status $(srcdir)/qsexli.pc.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +qsehttp.pc: $(top_builddir)/config.status $(srcdir)/qsehttp.pc.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ mostlyclean-libtool: -rm -f *.lo clean-libtool: -rm -rf .libs _libs +install-pkgconfigDATA: $(pkgconfig_DATA) + @$(NORMAL_INSTALL) + @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \ + done + +uninstall-pkgconfigDATA: + @$(NORMAL_UNINSTALL) + @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -529,9 +596,12 @@ distdir: $(DISTFILES) done check-am: all-am check: check-recursive -all-am: Makefile +all-am: Makefile $(DATA) installdirs: installdirs-recursive installdirs-am: + for dir in "$(DESTDIR)$(pkgconfigdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive @@ -582,7 +652,7 @@ info: info-recursive info-am: -install-data-am: +install-data-am: install-pkgconfigDATA install-dvi: install-dvi-recursive @@ -626,7 +696,7 @@ ps: ps-recursive ps-am: -uninstall-am: +uninstall-am: uninstall-pkgconfigDATA .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ install-am install-strip tags-recursive @@ -639,11 +709,12 @@ uninstall-am: install-data-am install-dvi install-dvi-am install-exec \ install-exec-am install-html install-html-am install-info \ install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am + install-pkgconfigDATA install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-recursive uninstall uninstall-am \ + uninstall-pkgconfigDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/qse/lib/qseawk.pc.in b/qse/lib/qseawk.pc.in new file mode 100644 index 00000000..7e0da60c --- /dev/null +++ b/qse/lib/qseawk.pc.in @@ -0,0 +1,12 @@ +prefix=@prefix@ +exec_prefix=${prefix} +includedir=${prefix}/include +libdir=${exec_prefix}/lib + +Name: QSEAWK Library +Description: QSEAWK Library +Version: @VERSION@ +Cflags: -I${includedir} +Libs: -L${libdir} -lqseawk +Requires: qsecmn qsesed +#Requires.private: qsecmn qsesed diff --git a/qse/lib/qsecmn.pc.in b/qse/lib/qsecmn.pc.in new file mode 100644 index 00000000..6f42ca48 --- /dev/null +++ b/qse/lib/qsecmn.pc.in @@ -0,0 +1,10 @@ +prefix=@prefix@ +exec_prefix=${prefix} +includedir=${prefix}/include +libdir=${exec_prefix}/lib + +Name: QSECMN Library +Description: QSECMN Library +Version: @VERSION@ +Cflags: -I${includedir} +Libs: -L${libdir} -lqsecmn diff --git a/qse/lib/qsehttp.pc.in b/qse/lib/qsehttp.pc.in new file mode 100644 index 00000000..430142b6 --- /dev/null +++ b/qse/lib/qsehttp.pc.in @@ -0,0 +1,13 @@ +prefix=@prefix@ +exec_prefix=${prefix} +includedir=${prefix}/include +libdir=${exec_prefix}/lib + +Name: QSEHTTP Library +Description: QSEHTTP Library +Version: @VERSION@ +Cflags: -I${includedir} +Libs: -L${libdir} -lqsehttp +# TODO: Produce Requres: using the autoconf settings +Requires: qsecmn +Requires.private: openssl diff --git a/qse/lib/qsesed.pc.in b/qse/lib/qsesed.pc.in new file mode 100644 index 00000000..e8098d36 --- /dev/null +++ b/qse/lib/qsesed.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=${prefix} +includedir=${prefix}/include +libdir=${exec_prefix}/lib + +Name: QSESED Library +Description: QSESED Library +Version: @VERSION@ +Cflags: -I${includedir} +Libs: -L${libdir} -lqsesed +Requires: qsecmn diff --git a/qse/lib/qsexli.pc.in b/qse/lib/qsexli.pc.in new file mode 100644 index 00000000..9f2d0457 --- /dev/null +++ b/qse/lib/qsexli.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=${prefix} +includedir=${prefix}/include +libdir=${exec_prefix}/lib + +Name: QSEXLI Library +Description: QSEXLI Library +Version: @VERSION@ +Cflags: -I${includedir} +Libs: -L${libdir} -lqsexli +Requires: qsecmn