518 lines
20 KiB
Diff
518 lines
20 KiB
Diff
diff -Naur tntnet-2.2.1/configure tntnet-2.2.1.patch/configure
|
|
--- tntnet-2.2.1/configure 2014-01-17 20:11:49.000000000 +0100
|
|
+++ tntnet-2.2.1.patch/configure 2016-01-07 06:34:42.002634975 +0100
|
|
@@ -16495,7 +16546,7 @@
|
|
ac_config_files="$ac_config_files tntnet-config"
|
|
|
|
|
|
-ac_config_files="$ac_config_files Makefile framework/common/Makefile framework/runtime/Makefile framework/defcomp/Makefile sdk/tools/common/Makefile sdk/tools/ecppc/Makefile sdk/tools/ecppl/Makefile sdk/tools/ecppll/Makefile sdk/demos/Makefile sdk/demos/backgroundjob/Makefile sdk/demos/calc/Makefile sdk/demos/calcajax/Makefile sdk/demos/calcapp/Makefile sdk/demos/calcmvc/Makefile sdk/demos/calci18n/Makefile sdk/demos/chat/Makefile sdk/demos/comp/Makefile sdk/demos/config/Makefile sdk/demos/controls/Makefile sdk/demos/cookie/Makefile sdk/demos/hello/Makefile sdk/demos/savepoint/Makefile sdk/demos/session/Makefile sdk/demos/sprintf/Makefile sdk/demos/strings/Makefile sdk/demos/rajax-jquery/Makefile sdk/demos/upload/Makefile utest/Makefile doc/man/Makefile etc/Makefile"
|
|
+ac_config_files="$ac_config_files Makefile framework/common/Makefile framework/runtime/Makefile framework/defcomp/Makefile pkgconfig/tntnet.pc pkgconfig/tntnet_sdk.pc sdk/tools/common/Makefile sdk/tools/ecppc/Makefile sdk/tools/ecppl/Makefile sdk/tools/ecppll/Makefile sdk/demos/Makefile sdk/demos/backgroundjob/Makefile sdk/demos/calc/Makefile sdk/demos/calcajax/Makefile sdk/demos/calcapp/Makefile sdk/demos/calcmvc/Makefile sdk/demos/calci18n/Makefile sdk/demos/chat/Makefile sdk/demos/comp/Makefile sdk/demos/config/Makefile sdk/demos/controls/Makefile sdk/demos/cookie/Makefile sdk/demos/hello/Makefile sdk/demos/savepoint/Makefile sdk/demos/session/Makefile sdk/demos/sprintf/Makefile sdk/demos/strings/Makefile sdk/demos/rajax-jquery/Makefile sdk/demos/upload/Makefile utest/Makefile doc/man/Makefile etc/Makefile"
|
|
|
|
|
|
cat >confcache <<\_ACEOF
|
|
@@ -17642,6 +17693,8 @@
|
|
"framework/common/Makefile") CONFIG_FILES="$CONFIG_FILES framework/common/Makefile" ;;
|
|
"framework/runtime/Makefile") CONFIG_FILES="$CONFIG_FILES framework/runtime/Makefile" ;;
|
|
"framework/defcomp/Makefile") CONFIG_FILES="$CONFIG_FILES framework/defcomp/Makefile" ;;
|
|
+ "pkgconfig/tntnet.pc") CONFIG_FILES="$CONFIG_FILES pkgconfig/tntnet.pc" ;;
|
|
+ "pkgconfig/tntnet_sdk.pc") CONFIG_FILES="$CONFIG_FILES pkgconfig/tntnet_sdk.pc" ;;
|
|
"sdk/tools/common/Makefile") CONFIG_FILES="$CONFIG_FILES sdk/tools/common/Makefile" ;;
|
|
"sdk/tools/ecppc/Makefile") CONFIG_FILES="$CONFIG_FILES sdk/tools/ecppc/Makefile" ;;
|
|
"sdk/tools/ecppl/Makefile") CONFIG_FILES="$CONFIG_FILES sdk/tools/ecppl/Makefile" ;;
|
|
diff -Naur tntnet-2.2.1/configure.in tntnet-2.2.1.patch/configure.in
|
|
--- tntnet-2.2.1/configure.in 2014-01-17 20:11:40.000000000 +0100
|
|
+++ tntnet-2.2.1.patch/configure.in 2016-01-07 06:08:14.679087771 +0100
|
|
@@ -218,6 +218,8 @@
|
|
framework/common/Makefile
|
|
framework/runtime/Makefile
|
|
framework/defcomp/Makefile
|
|
+ pkgconfig/tntnet.pc
|
|
+ pkgconfig/tntnet_sdk.pc
|
|
sdk/tools/common/Makefile
|
|
sdk/tools/ecppc/Makefile
|
|
sdk/tools/ecppl/Makefile
|
|
diff -Naur tntnet-2.2.1/Makefile.am tntnet-2.2.1.patch/Makefile.am
|
|
--- tntnet-2.2.1/Makefile.am 2014-01-17 20:12:20.000000000 +0100
|
|
+++ tntnet-2.2.1.patch/Makefile.am 2016-01-07 06:07:03.793973412 +0100
|
|
@@ -80,3 +80,9 @@
|
|
Releasenotes-2.2.markdown \
|
|
Releasenotes-2.2.1.markdown \
|
|
$(pkgdata_SCRIPTS)
|
|
+
|
|
+pkgconfigdir = $(libdir)/pkgconfig/
|
|
+
|
|
+pkgconfig_DATA = \
|
|
+ pkgconfig/tntnet.pc \
|
|
+ pkgconfig/tntnet_sdk.pc
|
|
diff -Naur tntnet-2.2.1/Makefile.in tntnet-2.2.1.patch/Makefile.in
|
|
--- tntnet-2.2.1/Makefile.in 2014-01-17 20:12:26.000000000 +0100
|
|
+++ tntnet-2.2.1.patch/Makefile.in 2016-01-07 06:33:05.045478363 +0100
|
|
@@ -1,7 +1,7 @@
|
|
-# Makefile.in generated by automake 1.12.2 from Makefile.am.
|
|
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
|
|
# @configure_input@
|
|
|
|
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
|
|
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
|
|
|
|
# This Makefile.in is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
@@ -14,24 +14,53 @@
|
|
|
|
@SET_MAKE@
|
|
|
|
+
|
|
VPATH = @srcdir@
|
|
-am__make_dryrun = \
|
|
- { \
|
|
- am__dry=no; \
|
|
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
|
|
+am__make_running_with_option = \
|
|
+ case $${target_option-} in \
|
|
+ ?) ;; \
|
|
+ *) echo "am__make_running_with_option: internal error: invalid" \
|
|
+ "target option '$${target_option-}' specified" >&2; \
|
|
+ exit 1;; \
|
|
+ esac; \
|
|
+ has_opt=no; \
|
|
+ sane_makeflags=$$MAKEFLAGS; \
|
|
+ if $(am__is_gnu_make); then \
|
|
+ sane_makeflags=$$MFLAGS; \
|
|
+ else \
|
|
case $$MAKEFLAGS in \
|
|
*\\[\ \ ]*) \
|
|
- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
|
|
- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
|
|
- *) \
|
|
- for am__flg in $$MAKEFLAGS; do \
|
|
- case $$am__flg in \
|
|
- *=*|--*) ;; \
|
|
- *n*) am__dry=yes; break;; \
|
|
- esac; \
|
|
- done;; \
|
|
+ bs=\\; \
|
|
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
|
|
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
|
|
esac; \
|
|
- test $$am__dry = yes; \
|
|
- }
|
|
+ fi; \
|
|
+ skip_next=no; \
|
|
+ strip_trailopt () \
|
|
+ { \
|
|
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
|
|
+ }; \
|
|
+ for flg in $$sane_makeflags; do \
|
|
+ test $$skip_next = yes && { skip_next=no; continue; }; \
|
|
+ case $$flg in \
|
|
+ *=*|--*) continue;; \
|
|
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
|
|
+ -*I?*) strip_trailopt 'I';; \
|
|
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
|
|
+ -*O?*) strip_trailopt 'O';; \
|
|
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
|
|
+ -*l?*) strip_trailopt 'l';; \
|
|
+ -[dEDm]) skip_next=yes;; \
|
|
+ -[JT]) skip_next=yes;; \
|
|
+ esac; \
|
|
+ case $$flg in \
|
|
+ *$$target_option*) has_opt=yes; break;; \
|
|
+ esac; \
|
|
+ done; \
|
|
+ test $$has_opt = yes
|
|
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
|
|
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
|
|
pkgdatadir = $(datadir)/@PACKAGE@
|
|
pkgincludedir = $(includedir)/@PACKAGE@
|
|
pkglibdir = $(libdir)/@PACKAGE@
|
|
@@ -52,11 +81,13 @@
|
|
host_triplet = @host@
|
|
target_triplet = @target@
|
|
subdir = .
|
|
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
|
|
- $(srcdir)/Makefile.in $(srcdir)/tntnet-config.in \
|
|
- $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
|
|
- TODO config.guess config.sub depcomp install-sh ltmain.sh \
|
|
- missing
|
|
+DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
|
|
+ $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
|
|
+ $(top_srcdir)/configure $(am__configure_deps) \
|
|
+ $(srcdir)/tntnet-config.in \
|
|
+ $(top_srcdir)/pkgconfig/tntnet.pc.in \
|
|
+ $(top_srcdir)/pkgconfig/tntnet_sdk.pc.in COPYING TODO \
|
|
+ config.guess config.sub depcomp install-sh missing ltmain.sh
|
|
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
|
am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \
|
|
$(top_srcdir)/m4/ax_check_compile_flag.m4 \
|
|
@@ -71,7 +102,8 @@
|
|
configure.lineno config.status.lineno
|
|
mkinstalldirs = $(install_sh) -d
|
|
CONFIG_HEADER = $(top_builddir)/framework/common/config.h
|
|
-CONFIG_CLEAN_FILES = tntnet-config
|
|
+CONFIG_CLEAN_FILES = tntnet-config pkgconfig/tntnet.pc \
|
|
+ pkgconfig/tntnet_sdk.pc
|
|
CONFIG_CLEAN_VPATH_FILES =
|
|
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
|
|
am__vpath_adj = case $$p in \
|
|
@@ -100,27 +132,62 @@
|
|
|| { echo " ( cd '$$dir' && rm -f" $$files ")"; \
|
|
$(am__cd) "$$dir" && rm -f $$files; }; \
|
|
}
|
|
-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgdatadir)"
|
|
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgdatadir)" \
|
|
+ "$(DESTDIR)$(pkgconfigdir)"
|
|
SCRIPTS = $(bin_SCRIPTS) $(pkgdata_SCRIPTS)
|
|
+AM_V_P = $(am__v_P_@AM_V@)
|
|
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
|
|
+am__v_P_0 = false
|
|
+am__v_P_1 = :
|
|
+AM_V_GEN = $(am__v_GEN_@AM_V@)
|
|
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
|
|
+am__v_GEN_0 = @echo " GEN " $@;
|
|
+am__v_GEN_1 =
|
|
+AM_V_at = $(am__v_at_@AM_V@)
|
|
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
|
|
+am__v_at_0 = @
|
|
+am__v_at_1 =
|
|
SOURCES =
|
|
DIST_SOURCES =
|
|
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
|
|
- html-recursive info-recursive install-data-recursive \
|
|
- install-dvi-recursive install-exec-recursive \
|
|
- install-html-recursive install-info-recursive \
|
|
- install-pdf-recursive install-ps-recursive install-recursive \
|
|
- installcheck-recursive installdirs-recursive pdf-recursive \
|
|
- ps-recursive uninstall-recursive
|
|
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
|
|
+ ctags-recursive dvi-recursive html-recursive info-recursive \
|
|
+ install-data-recursive install-dvi-recursive \
|
|
+ install-exec-recursive install-html-recursive \
|
|
+ install-info-recursive install-pdf-recursive \
|
|
+ install-ps-recursive install-recursive installcheck-recursive \
|
|
+ installdirs-recursive pdf-recursive ps-recursive \
|
|
+ tags-recursive uninstall-recursive
|
|
am__can_run_installinfo = \
|
|
case $$AM_UPDATE_INFO_DIR in \
|
|
n|no|NO) false;; \
|
|
*) (install-info --version) >/dev/null 2>&1;; \
|
|
esac
|
|
+DATA = $(pkgconfig_DATA)
|
|
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
|
|
distclean-recursive maintainer-clean-recursive
|
|
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
|
|
- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
|
|
+am__recursive_targets = \
|
|
+ $(RECURSIVE_TARGETS) \
|
|
+ $(RECURSIVE_CLEAN_TARGETS) \
|
|
+ $(am__extra_recursive_targets)
|
|
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
|
|
cscope distdir dist dist-all distcheck
|
|
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
|
|
+# Read a list of newline-separated strings from the standard input,
|
|
+# and print each of them once, without duplicates. Input order is
|
|
+# *not* preserved.
|
|
+am__uniquify_input = $(AWK) '\
|
|
+ BEGIN { nonempty = 0; } \
|
|
+ { items[$$0] = 1; nonempty = 1; } \
|
|
+ END { if (nonempty) { for (i in items) print i; }; } \
|
|
+'
|
|
+# Make sure the list of sources is unique. This is necessary because,
|
|
+# e.g., the same source file might be shared among _SOURCES variables
|
|
+# for different programs/libraries.
|
|
+am__define_uniq_tagged_files = \
|
|
+ list='$(am__tagged_files)'; \
|
|
+ unique=`for i in $$list; do \
|
|
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
|
|
+ done | $(am__uniquify_input)`
|
|
ETAGS = etags
|
|
CTAGS = ctags
|
|
CSCOPE = cscope
|
|
@@ -179,6 +246,7 @@
|
|
ACLOCAL = @ACLOCAL@
|
|
AMTAR = @AMTAR@
|
|
AM_CFLAGS = @AM_CFLAGS@
|
|
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
|
|
AR = @AR@
|
|
AUTOCONF = @AUTOCONF@
|
|
AUTOHEADER = @AUTOHEADER@
|
|
@@ -382,6 +450,11 @@
|
|
Releasenotes-2.2.1.markdown \
|
|
$(pkgdata_SCRIPTS)
|
|
|
|
+pkgconfigdir = $(libdir)/pkgconfig/
|
|
+pkgconfig_DATA = \
|
|
+ pkgconfig/tntnet.pc \
|
|
+ pkgconfig/tntnet_sdk.pc
|
|
+
|
|
all: all-recursive
|
|
|
|
.SUFFIXES:
|
|
@@ -421,6 +494,10 @@
|
|
$(am__aclocal_m4_deps):
|
|
tntnet-config: $(top_builddir)/config.status $(srcdir)/tntnet-config.in
|
|
cd $(top_builddir) && $(SHELL) ./config.status $@
|
|
+pkgconfig/tntnet.pc: $(top_builddir)/config.status $(top_srcdir)/pkgconfig/tntnet.pc.in
|
|
+ cd $(top_builddir) && $(SHELL) ./config.status $@
|
|
+pkgconfig/tntnet_sdk.pc: $(top_builddir)/config.status $(top_srcdir)/pkgconfig/tntnet_sdk.pc.in
|
|
+ cd $(top_builddir) && $(SHELL) ./config.status $@
|
|
install-binSCRIPTS: $(bin_SCRIPTS)
|
|
@$(NORMAL_INSTALL)
|
|
@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
|
|
@@ -500,6 +577,27 @@
|
|
|
|
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.
|
|
@@ -507,14 +605,13 @@
|
|
# (1) if the variable is set in 'config.status', edit 'config.status'
|
|
# (which will cause the Makefiles to be regenerated when you run 'make');
|
|
# (2) otherwise, pass the desired values on the 'make' command line.
|
|
-$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS):
|
|
- @fail= failcom='exit 1'; \
|
|
- for f in x $$MAKEFLAGS; do \
|
|
- case $$f in \
|
|
- *=* | --[!k]*);; \
|
|
- *k*) failcom='fail=yes';; \
|
|
- esac; \
|
|
- done; \
|
|
+$(am__recursive_targets):
|
|
+ @fail=; \
|
|
+ if $(am__make_keepgoing); then \
|
|
+ failcom='fail=yes'; \
|
|
+ else \
|
|
+ failcom='exit 1'; \
|
|
+ fi; \
|
|
dot_seen=no; \
|
|
target=`echo $@ | sed s/-recursive//`; \
|
|
case "$@" in \
|
|
@@ -535,31 +632,13 @@
|
|
if test "$$dot_seen" = "no"; then \
|
|
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
|
|
fi; test -z "$$fail"
|
|
-tags-recursive:
|
|
- list='$(SUBDIRS)'; for subdir in $$list; do \
|
|
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
|
|
- done
|
|
-ctags-recursive:
|
|
- list='$(SUBDIRS)'; for subdir in $$list; do \
|
|
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
|
|
- done
|
|
-cscopelist-recursive:
|
|
- list='$(SUBDIRS)'; for subdir in $$list; do \
|
|
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \
|
|
- done
|
|
|
|
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
|
|
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
|
- unique=`for i in $$list; do \
|
|
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
|
|
- done | \
|
|
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
|
- END { if (nonempty) { for (i in files) print i; }; }'`; \
|
|
- mkid -fID $$unique
|
|
-tags: TAGS
|
|
+ID: $(am__tagged_files)
|
|
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
|
|
+tags: tags-recursive
|
|
+TAGS: tags
|
|
|
|
-TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
|
- $(TAGS_FILES) $(LISP)
|
|
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
|
|
set x; \
|
|
here=`pwd`; \
|
|
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
|
|
@@ -575,12 +654,7 @@
|
|
set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
|
|
fi; \
|
|
done; \
|
|
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
|
- unique=`for i in $$list; do \
|
|
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
|
|
- done | \
|
|
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
|
- END { if (nonempty) { for (i in files) print i; }; }'`; \
|
|
+ $(am__define_uniq_tagged_files); \
|
|
shift; \
|
|
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
|
|
test -n "$$unique" || unique=$$empty_fix; \
|
|
@@ -592,15 +666,11 @@
|
|
$$unique; \
|
|
fi; \
|
|
fi
|
|
-ctags: CTAGS
|
|
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
|
- $(TAGS_FILES) $(LISP)
|
|
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
|
- unique=`for i in $$list; do \
|
|
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
|
|
- done | \
|
|
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
|
- END { if (nonempty) { for (i in files) print i; }; }'`; \
|
|
+ctags: ctags-recursive
|
|
+
|
|
+CTAGS: ctags
|
|
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
|
|
+ $(am__define_uniq_tagged_files); \
|
|
test -z "$(CTAGS_ARGS)$$unique" \
|
|
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
|
|
$$unique
|
|
@@ -609,18 +679,16 @@
|
|
here=`$(am__cd) $(top_builddir) && pwd` \
|
|
&& $(am__cd) $(top_srcdir) \
|
|
&& gtags -i $(GTAGS_ARGS) "$$here"
|
|
-
|
|
cscope: cscope.files
|
|
test ! -s cscope.files \
|
|
|| $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
|
|
-
|
|
clean-cscope:
|
|
-rm -f cscope.files
|
|
+cscope.files: clean-cscope cscopelist
|
|
+cscopelist: cscopelist-recursive
|
|
|
|
-cscope.files: clean-cscope cscopelist-recursive cscopelist
|
|
-
|
|
-cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP)
|
|
- list='$(SOURCES) $(HEADERS) $(LISP)'; \
|
|
+cscopelist-am: $(am__tagged_files)
|
|
+ list='$(am__tagged_files)'; \
|
|
case "$(srcdir)" in \
|
|
[\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
|
|
*) sdir=$(subdir)/$(srcdir) ;; \
|
|
@@ -754,9 +822,9 @@
|
|
*.zip*) \
|
|
unzip $(distdir).zip ;;\
|
|
esac
|
|
- chmod -R a-w $(distdir); chmod u+w $(distdir)
|
|
- mkdir $(distdir)/_build
|
|
- mkdir $(distdir)/_inst
|
|
+ chmod -R a-w $(distdir)
|
|
+ chmod u+w $(distdir)
|
|
+ mkdir $(distdir)/_build $(distdir)/_inst
|
|
chmod a-w $(distdir)
|
|
test -d $(distdir)/_build || exit 0; \
|
|
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
|
|
@@ -820,10 +888,10 @@
|
|
exit 1; } >&2
|
|
check-am: all-am
|
|
check: check-recursive
|
|
-all-am: Makefile $(SCRIPTS)
|
|
+all-am: Makefile $(SCRIPTS) $(DATA)
|
|
installdirs: installdirs-recursive
|
|
installdirs-am:
|
|
- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgdatadir)"; do \
|
|
+ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgconfigdir)"; do \
|
|
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
|
|
done
|
|
install: install-recursive
|
|
@@ -878,7 +946,7 @@
|
|
|
|
info-am:
|
|
|
|
-install-data-am: install-pkgdataSCRIPTS
|
|
+install-data-am: install-pkgconfigDATA install-pkgdataSCRIPTS
|
|
|
|
install-dvi: install-dvi-recursive
|
|
|
|
@@ -924,30 +992,29 @@
|
|
|
|
ps-am:
|
|
|
|
-uninstall-am: uninstall-binSCRIPTS uninstall-pkgdataSCRIPTS
|
|
+uninstall-am: uninstall-binSCRIPTS uninstall-pkgconfigDATA \
|
|
+ uninstall-pkgdataSCRIPTS
|
|
+
|
|
+.MAKE: $(am__recursive_targets) install-am install-strip
|
|
|
|
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \
|
|
- cscopelist-recursive ctags-recursive install-am install-strip \
|
|
- tags-recursive
|
|
-
|
|
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
|
|
- all all-am am--refresh check check-am clean clean-cscope \
|
|
- clean-generic clean-libtool cscope cscopelist \
|
|
- cscopelist-recursive ctags ctags-recursive dist dist-all \
|
|
- dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ dist-xz \
|
|
- dist-zip distcheck distclean distclean-generic \
|
|
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
|
|
+ am--refresh check check-am clean clean-cscope clean-generic \
|
|
+ clean-libtool cscope cscopelist-am ctags ctags-am dist \
|
|
+ dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \
|
|
+ dist-xz dist-zip distcheck distclean distclean-generic \
|
|
distclean-libtool distclean-tags distcleancheck distdir \
|
|
distuninstallcheck dvi dvi-am html html-am info info-am \
|
|
install install-am install-binSCRIPTS 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-pkgdataSCRIPTS 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-binSCRIPTS uninstall-pkgdataSCRIPTS
|
|
+ install-pkgconfigDATA install-pkgdataSCRIPTS 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-am uninstall \
|
|
+ uninstall-am uninstall-binSCRIPTS uninstall-pkgconfigDATA \
|
|
+ uninstall-pkgdataSCRIPTS
|
|
|
|
|
|
tntnet-config: tntnet-config.in
|
|
diff -Naur tntnet-2.2.1/pkgconfig/tntnet.pc.in tntnet-2.2.1.patch/pkgconfig/tntnet.pc.in
|
|
--- tntnet-2.2.1/pkgconfig/tntnet.pc.in 1970-01-01 01:00:00.000000000 +0100
|
|
+++ tntnet-2.2.1.patch/pkgconfig/tntnet.pc.in 2016-01-07 06:07:03.794973414 +0100
|
|
@@ -0,0 +1,11 @@
|
|
+prefix=@prefix@
|
|
+exec_prefix=@exec_prefix@
|
|
+libdir=@libdir@
|
|
+includedir=@includedir@
|
|
+
|
|
+Name: tntnet
|
|
+Description: Modular, multithreaded web application library for C++
|
|
+Version: @PACKAGE_VERSION@
|
|
+Libs: -L${libdir} -ltntnet
|
|
+Cflags: -I${includedir}
|
|
+Requires.private: cxxtools
|
|
diff -Naur tntnet-2.2.1/pkgconfig/tntnet_sdk.pc.in tntnet-2.2.1.patch/pkgconfig/tntnet_sdk.pc.in
|
|
--- tntnet-2.2.1/pkgconfig/tntnet_sdk.pc.in 1970-01-01 01:00:00.000000000 +0100
|
|
+++ tntnet-2.2.1.patch/pkgconfig/tntnet_sdk.pc.in 2016-01-07 06:07:03.795973416 +0100
|
|
@@ -0,0 +1,11 @@
|
|
+prefix=@prefix@
|
|
+exec_prefix=@exec_prefix@
|
|
+libdir=@libdir@
|
|
+includedir=@includedir@
|
|
+
|
|
+Name: tntnet_sdk
|
|
+Description: Helper library for ecpp-parsing programs
|
|
+Version: @PACKAGE_VERSION@
|
|
+Libs: -L${libdir} -ltntnet_sdk
|
|
+Cflags: -I${includedir}
|
|
+Requires.private: cxxtools
|