diff --git a/Doxyfile.in b/Doxyfile.in index 4347b0c..56f4ea0 100644 --- a/Doxyfile.in +++ b/Doxyfile.in @@ -655,7 +655,7 @@ WARN_LOGFILE = # directories like "/usr/src/myproject". Separate the files or directories # with spaces. -INPUT = include/HTTPClient/ +INPUT = include/anetd/ # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is diff --git a/Makefile.am b/Makefile.am index a39da91..b4ed137 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,6 @@ ACLOCAL_AMFLAGS = -I autotools include autotools/am_prog_doxygen.am SUBDIRS = src example include -EXTRA_DIST = Doxyfile.in LICENSE \ No newline at end of file +EXTRA_DIST = Doxyfile.in LICENSE libanetd.pc.in +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = libanetd.pc \ No newline at end of file diff --git a/Makefile.in b/Makefile.in index b2f9199..cb7d794 100644 --- a/Makefile.in +++ b/Makefile.in @@ -43,6 +43,7 @@ # DX_CLEANFILES = everything to clean. # # This is usually added to MOSTLYCLEANFILES. + VPATH = @srcdir@ am__make_dryrun = \ { \ @@ -81,7 +82,8 @@ build_triplet = @build@ host_triplet = @host@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Doxyfile.in \ $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/autotools/am_prog_doxygen.am $(top_srcdir)/configure \ + $(srcdir)/autotools/am_prog_doxygen.am \ + $(srcdir)/libanetd.pc.in $(top_srcdir)/configure \ $(top_srcdir)/include/anetd/anetdConfig.h.in AUTHORS ChangeLog \ NEWS config.guess config.sub depcomp install-sh ltmain.sh \ missing @@ -110,7 +112,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/anetd/anetdConfig.h -CONFIG_CLEAN_FILES = Doxyfile +CONFIG_CLEAN_FILES = Doxyfile libanetd.pc CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = @@ -126,6 +128,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=) \ @@ -358,7 +389,9 @@ ACLOCAL_AMFLAGS = -I autotools @DX_COND_doc_TRUE@ $(DX_CLEAN_LATEX) SUBDIRS = src example include -EXTRA_DIST = Doxyfile.in LICENSE +EXTRA_DIST = Doxyfile.in LICENSE libanetd.pc.in +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = libanetd.pc all: all-recursive .SUFFIXES: @@ -414,6 +447,8 @@ distclean-hdr: -rm -f include/anetd/anetdConfig.h include/anetd/stamp-h1 Doxyfile: $(top_builddir)/config.status $(srcdir)/Doxyfile.in cd $(top_builddir) && $(SHELL) ./config.status $@ +libanetd.pc: $(top_builddir)/config.status $(srcdir)/libanetd.pc.in + cd $(top_builddir) && $(SHELL) ./config.status $@ mostlyclean-libtool: -rm -f *.lo @@ -423,6 +458,27 @@ clean-libtool: distclean-libtool: -rm -f libtool config.lt +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. @@ -743,9 +799,12 @@ distcleancheck: distclean exit 1; } >&2 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 @@ -798,7 +857,7 @@ info: info-recursive info-am: -install-data-am: +install-data-am: install-pkgconfigDATA install-dvi: install-dvi-recursive @@ -844,7 +903,7 @@ ps: ps-recursive ps-am: -uninstall-am: +uninstall-am: uninstall-pkgconfigDATA .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ cscopelist-recursive ctags-recursive install-am install-strip \ @@ -861,11 +920,12 @@ uninstall-am: install install-am install-data 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-pdf install-pdf-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 @DX_COND_doc_TRUE@@DX_COND_ps_TRUE@doxygen-ps: @DX_DOCDIR@/@PACKAGE@.ps diff --git a/configure b/configure index dfaa031..7c64db2 100755 --- a/configure +++ b/configure @@ -19883,7 +19883,7 @@ done CXXFLAGS="-g -O0" -ac_config_files="$ac_config_files Makefile src/Makefile example/Makefile Doxyfile include/Makefile" +ac_config_files="$ac_config_files Makefile src/Makefile example/Makefile Doxyfile include/Makefile libanetd.pc" cat >confcache <<\_ACEOF @@ -21046,6 +21046,7 @@ do "example/Makefile") CONFIG_FILES="$CONFIG_FILES example/Makefile" ;; "Doxyfile") CONFIG_FILES="$CONFIG_FILES Doxyfile" ;; "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; + "libanetd.pc") CONFIG_FILES="$CONFIG_FILES libanetd.pc" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac diff --git a/configure.in b/configure.in index 25cc837..3203ed8 100644 --- a/configure.in +++ b/configure.in @@ -57,6 +57,6 @@ AC_CHECK_FUNCS([socket]) CXXFLAGS="-g -O0" -AC_CONFIG_FILES([Makefile src/Makefile example/Makefile Doxyfile include/Makefile]) +AC_CONFIG_FILES([Makefile src/Makefile example/Makefile Doxyfile include/Makefile libanetd.pc]) AC_OUTPUT diff --git a/libanetd.pc.in b/libanetd.pc.in new file mode 100644 index 0000000..51d5919 --- /dev/null +++ b/libanetd.pc.in @@ -0,0 +1,10 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: libanetd +Description: Client Library for another network downloader +URL: http://wiki.my-ho.st/confluence/display/HTC/HttpClient+Home +Version: @VERSION@ +Libs: -L${libdir} -lanetd