gentoo resync : 22.05.2021

3 files changed, 6 insertions, 574 deletions

diff --git a/dev-lang/ferite/Manifest b/dev-lang/ferite/Manifest
index 940e6739ba30..9b91186c7e33 100644
--- a/dev-lang/ferite/Manifest
+++ b/dev-lang/ferite/Manifest
@@ -1,6 +1,6 @@
 AUX ferite-1.1.17-bool.patch 1935 BLAKE2B dc926f716e3abfefe48d74e638a35451ec856188e71d76797252b65d2024047543a25739c6bef81133bec0533c480b651dcea845db5dcd76eea70d1c49ed58d3 SHA512 6366d3388185541506c1adc8387c0f6fe91851c257cd4cc2d03afcae3c867e03718885f6e142812c66f429dff493b7e033288b47af54af1eede2a589ba0c1064
-AUX ferite-1.1.17-slibtool.patch 23689 BLAKE2B 838b3629fa75a652144da2dd9fbce2a075ddd877c78b206b929985453e2988f56c4263006ef9a9450726dd40e08782ca29fd052835ce8111473d6d679a9aa145 SHA512 64e05b7509d357a697eab255c92af61a61c02937dbcabd1306ecbff079565ddc7a239a7c9fe22f7392c81b8b3c7ad224c986f2bf2556f1384a4f848d575345b0
 AUX ferite-pcre.patch 1356 BLAKE2B f2c3669e33d12dce6e00d22b5884f0770021eb77297997bd94e777b114f8ae24f7ed23b10d7c877a7bffb61fe9ff0e126bd717ea8c8a8fb8186da89178ba4926 SHA512 e867c4b2fc993963bdf17d992d3dd007f636c85b0c13388480cec0f0ff70b6596274c19cd46b0e3ee11064f607b381f7f76888819ef6fb3bdd0804b07b5087fc
+DIST ferite-1.1.17-slibtool.patch.bz2 3945 BLAKE2B d816ccab7a58049e9c6048a5c5f4e162d8444a7c998eab1eadc76eb212cb08f9b0b68a96a2cc9003fbf923ab0bf8a7c25bae4d6ef08cdd21de054cd2ed910aa3 SHA512 772ad133016cef5c20905dd7ef589ced3d5bba7a327ddcca0db4ab8b7e59eb9a2d521372ed18c16594f418ec9c7195b711ac5d4dba6bc900b74e93d14f9ce36b
 DIST ferite-1.1.17.tar.gz 2174774 BLAKE2B 5e55ed4101bc5a9c031afef0d9bfcafdc0c498c4ddc712eb17e3059ebd55b925e6b0343113853b946a31a428e5f71c17a2365e629447bb504453b6a7d61358d8 SHA512 475983b865fba492661e59b7470b7e46889f29ed8ba829b112354963fafcbed6ab4d4677579337c1c4ed730c6fe02897743f56edae335ceda6277da975d1098f
-EBUILD ferite-1.1.17-r1.ebuild 2000 BLAKE2B e17ae71d2d7aabc08aded70d852169e086d9e0f7da54f19653d7d43dd24703f5737f3a3d7e5f45683ccf81fa5d5d51e66f79931be2cdb0d9f22a01613b593fea SHA512 d729a192c0ab752fbb408656fc8bc0156ffa524c39852dcf6bb85535b77de6f7b1d6f4f6c336c24ed38235167b9316ff5ddcfa66ca27d072c2cf4ba511f76e1b
+EBUILD ferite-1.1.17-r1.ebuild 2084 BLAKE2B 0cadea8ef190aaaf7c8e15cc49f6ed6ccaf80b4b222a89a2cb7e2899e6e471bd1a2dc5b121901eeeab85549744ae51a434be152b9710d1a231c1f54349fdc27f SHA512 9aea56058b201ae6b52df812d315bcdf270cff033583cad4d3f42042749942f782952ec1ec473a6029ff44bb2d0427486895dbb33425f33caf6ad3c6989b0f9b
 MISC metadata.xml 243 BLAKE2B fc4ef3433d84176432ef31abd4960ce0e2dcd4979228bf565712a1e574451b34689a8fff3dab4142e3997f084729bba1bc3d2c38d6ddf10d95a11e0b4412e03a SHA512 e3315331fae1a640778867a807694dc624ac88e4dbae2546780534a629d65d054cc6e376245fd31432d663775121cf07d74b2f1cd65d9d2d9cf9137d6598897a
diff --git a/dev-lang/ferite/ferite-1.1.17-r1.ebuild b/dev-lang/ferite/ferite-1.1.17-r1.ebuild
index 25c134b1f337..f3c2cbc6de5e 100644
--- a/dev-lang/ferite/ferite-1.1.17-r1.ebuild
+++ b/dev-lang/ferite/ferite-1.1.17-r1.ebuild
@@ -1,17 +1,18 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools
 
 DESCRIPTION="A clean, lightweight, object oriented scripting language"
 HOMEPAGE="http://ferite.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-slibtool.patch.bz2"
 
 LICENSE="BSD"
 SLOT="1"
 KEYWORDS="~alpha amd64 ppc -sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
 
 RDEPEND="
 	dev-libs/boehm-gc[threads]
@@ -23,7 +24,7 @@ DEPEND="${RDEPEND}"
 PATCHES=(
 	"${FILESDIR}"/${PN}-pcre.patch
 	"${FILESDIR}"/${P}-bool.patch
-	"${FILESDIR}"/${P}-slibtool.patch
+	"${WORKDIR}"/${P}-slibtool.patch
 )
 
 src_prepare() {
diff --git a/dev-lang/ferite/files/ferite-1.1.17-slibtool.patch b/dev-lang/ferite/files/ferite-1.1.17-slibtool.patch
deleted file mode 100644
index 4a6fc15de6e8..000000000000
--- a/dev-lang/ferite/files/ferite-1.1.17-slibtool.patch
+++ /dev/null
@@ -1,569 +0,0 @@
-commit 3cbead845f607628a44d78583534e6c0a74e9af1
-Author: orbea <orbea@riseup.net>
-Date:   Mon May 10 09:38:47 2021 -0700
-
-    Fix the build with -no-undefined.
-    
-    This adds correct usage of LDFLAGS and LIBADD.
-    
-    Signed-off-by: orbea <orbea@riseup.net>
-
-diff --git a/builder/builder.h b/builder/builder.h
-index e92b410..fa0055a 100644
---- a/builder/builder.h
-+++ b/builder/builder.h
-@@ -51,10 +51,6 @@ typedef struct __builder_module {
-   "MAINTAINERCLEANFILES = %s*.h %s*.c %s*~\n\n"                                      \
-   "CLEANFILES       = \n"                                                            \
-   "\n"                                                                               \
--  "if NEED_FERITE_LIB\n"                                                             \
--  "libferite = -L${top_builddir}/src -lferite\n"                                     \
--  "endif\n\n"                                                                        \
--  "LDFLAGS          = $(libferite) -L${libdir} @%s_LIBS@\n"                          \
-   "INCLUDES         = -I$(top_srcdir)/include -I$(prefix)/include -I. @%s_CFLAGS@\n" \
-   "DEFS             = @thread_defs@\n"                                               \
-   "\nscripts_DATA   = %s\nscriptsdir       = @FE_XPLAT_LIBRARY_PATH@\n\n"            \
-@@ -65,7 +61,7 @@ typedef struct __builder_module {
-   "\n"                                                                               \
-   "%s_la_SOURCES    = %s %s\n"                                                       \
-   "%s_la_LDFLAGS    = -no-undefined -module -avoid-version\n"                        \
--  "%s_la_LIBADD     =\n"                                                             \
-+  "%s_la_LIBADD     = ${top_builddir}/src/libferite.la\n"                            \
-   "\n"                                                                               \
-   "%s_core.c: %s\n"                                                                  \
-   "\t%s -m %s %s/%s/%s\n\n%s"    
-diff --git a/configure.ac b/configure.ac
-index 5b2f644..d5e713d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -78,8 +78,6 @@ AC_DEFINE_UNQUOTED([PLATFORM], "$platform", [The Platform on which we exist])
- CFLAGS="-DHAVE_CONFIG_HEADER -L$prefix/lib $CFLAGS"
- CCFLAGS="-DHAVE_CONFIG_HEADER  -L$prefix/lib $CCFLAGS"
- 
--AM_CONDITIONAL(NEED_FERITE_LIB, test "$system" = "Darwin" -o "$system" = "CYGWIN" -o "$system" = "SunOS" -o "$system" = "MINGW")
--
- AC_PROG_INSTALL
- AC_PROG_MAKE_SET
- 
-diff --git a/libs/aphex/src/Makefile.am b/libs/aphex/src/Makefile.am
-index 2b14cb7..57a8311 100644
---- a/libs/aphex/src/Makefile.am
-+++ b/libs/aphex/src/Makefile.am
-@@ -6,8 +6,6 @@ AUTOMAKE_OPTIONS     = no-dependencies foreign
- 
- MAINTAINERCLEANFILES = Makefile.in
- 
--LDFLAGS		         = -L${prefix}/lib
--
- INCLUDES	         = -I${top_srcdir}/libs/aphex/include -I${top_srcdir}/include -I${prefix}/include -I$(includedir) @aphex_INCS@
-                        
- 			
-@@ -18,7 +16,7 @@ noinst_LTLIBRARIES   = libaphex.la
- include_HEADERS      =
- 
- libaphex_la_DEPENDENCIES = $(top_builddir)/config.h
--libaphex_la_LDFLAGS      = -no-undefined $(LDFLAGS) -m @aphex_LDFLAGS@
-+libaphex_la_LDFLAGS      = -no-undefined -m @aphex_LDFLAGS@
- libaphex_la_LIBADD       = @thread_libs@ @gc_libs@
- 
- libaphex_la_SOURCES  = aphex_file.c aphex_directory.c aphex_config.c aphex_match.c aphex_thread.c aphex_notify.c poll.c poll.h
-diff --git a/libs/triton/src/Makefile.am b/libs/triton/src/Makefile.am
-index 0572996..0b25ba3 100644
---- a/libs/triton/src/Makefile.am
-+++ b/libs/triton/src/Makefile.am
-@@ -6,8 +6,6 @@ AUTOMAKE_OPTIONS     = no-dependencies foreign
- 
- MAINTAINERCLEANFILES = Makefile.in
- 
--LDFLAGS		         = -L/usr/local/lib
--
- INCLUDES	         = -I${top_srcdir} -I${top_srcdir}/libs/triton/include -I${top_srcdir}/include -I${prefix}/include -I$(includedir) @TRITON_INCS@
- 
- DEFS                 = @debugdefs@
-@@ -23,6 +21,6 @@ CLEANFILES = libltdl.la libltdlc.la
- include_HEADERS      =
- 
- libtriton_la_DEPENDENCIES = $(top_builddir)/config.h
--libtriton_la_LDFLAGS      = -no-undefined $(LDFLAGS) -m @TRITON_LDFLAGS@
-+libtriton_la_LDFLAGS      = -no-undefined -m @TRITON_LDFLAGS@
- 
- libtriton_la_SOURCES = triton_core.c  triton_loader_dlfcn.c triton_loader_ltdl.c triton_loader_darwin.c triton_loader_win32.c
-diff --git a/modules/array/Makefile.am b/modules/array/Makefile.am
-index 9f0475d..8bef2b8 100644
---- a/modules/array/Makefile.am
-+++ b/modules/array/Makefile.am
-@@ -7,11 +7,6 @@ MAINTAINERCLEANFILES = array*.h array*.c array*~
- 
- CLEANFILES       = 
- 
--if NEED_FERITE_LIB
--libferite = -L${top_builddir}/src -lferite
--endif
--
--LDFLAGS          = $(libferite) -L${libdir} @array_LIBS@
- INCLUDES         = -I$(top_srcdir)/include -I$(prefix)/include -I. @array_CFLAGS@
- DEFS             = @thread_defs@
- 
-@@ -27,7 +22,7 @@ pkg_LTLIBRARIES  = array.la
- 
- array_la_SOURCES    = array_core.c array_misc.c array_Array.c array_header.h  util.c util.h 
- array_la_LDFLAGS    = -no-undefined -module -avoid-version
--array_la_LIBADD     =
-+array_la_LIBADD     = ${top_builddir}/src/libferite.la
- 
- array_core.c: @MODULE_SRC_PREFIX@/array/array.fec 
- 	@BUILDER@ -m array @MODULE_SRC_PREFIX@/array/array.fec
-diff --git a/modules/date/Makefile.am b/modules/date/Makefile.am
-index ab646b4..976baa0 100644
---- a/modules/date/Makefile.am
-+++ b/modules/date/Makefile.am
-@@ -7,11 +7,6 @@ MAINTAINERCLEANFILES = date*.h date*.c date*~
- 
- CLEANFILES       = 
- 
--if NEED_FERITE_LIB
--libferite = -L${top_builddir}/src -lferite -L${top_builddir}/modules/stream -lferitestream
--endif
--
--LDFLAGS          = $(libferite) -L${libdir} @date_LIBS@
- INCLUDES         = -I$(top_srcdir)/include -I$(prefix)/include -I. @date_CFLAGS@
- DEFS             = @thread_defs@
- 
-@@ -27,7 +22,7 @@ pkg_LTLIBRARIES  = date.la
- 
- date_la_SOURCES    = date_core.c date_header.h date_misc.c date_Alarm.c date_Date.c util_date.c util_date.h strptime.c
- date_la_LDFLAGS    = -no-undefined -module -avoid-version
--date_la_LIBADD     =
-+date_la_LIBADD     = ${top_builddir}/modules/stream/libferitestream.la
- 
- date_core.c: @MODULE_SRC_PREFIX@/date/date.fec
- 	@BUILDER@ -m date @MODULE_SRC_PREFIX@/date/date.fec
-diff --git a/modules/filesystem/Makefile.am b/modules/filesystem/Makefile.am
-index ac5b5e9..227a5ab 100644
---- a/modules/filesystem/Makefile.am
-+++ b/modules/filesystem/Makefile.am
-@@ -7,11 +7,6 @@ MAINTAINERCLEANFILES = filesystem*.h filesystem*.c filesystem*~
- 
- CLEANFILES       = 
- 
--if NEED_FERITE_LIB
--libferite = -L${top_builddir}/src -lferite  -L${top_builddir}/modules/stream -lferitestream
--endif
--
--LDFLAGS          = $(libferite) -L${libdir} @filesystem_LIBS@
- INCLUDES         = -I$(top_srcdir)/include -I$(prefix)/include -I. @filesystem_CFLAGS@
- DEFS             = @thread_defs@
- 
-@@ -27,7 +22,7 @@ pkg_LTLIBRARIES  = filesystem.la
- 
- filesystem_la_SOURCES    = filesystem_core.c filesystem_misc.c filesystem_FileSystem.c filesystem_Directory.c filesystem_File.c filesystem_header.h  
- filesystem_la_LDFLAGS    = -no-undefined -module -avoid-version
--filesystem_la_LIBADD     =
-+filesystem_la_LIBADD     = ${top_builddir}/modules/stream/libferitestream.la
- 
- filesystem_core.c: @MODULE_SRC_PREFIX@/filesystem/filesystem.fec
- 	@BUILDER@ -m filesystem @MODULE_SRC_PREFIX@/filesystem/filesystem.fec
-diff --git a/modules/ipc/Makefile.am b/modules/ipc/Makefile.am
-index 3367aa2..18f9593 100644
---- a/modules/ipc/Makefile.am
-+++ b/modules/ipc/Makefile.am
-@@ -7,11 +7,6 @@ MAINTAINERCLEANFILES = ipc*.h ipc*.c ipc*~
- 
- CLEANFILES       = 
- 
--if NEED_FERITE_LIB
--libferite = -L${top_builddir}/src -lferite
--endif
--
--LDFLAGS          = $(libferite) -L${libdir} @ipc_LIBS@
- INCLUDES         = -I$(top_srcdir)/include -I$(prefix)/include -I. @ipc_CFLAGS@
- DEFS             = @thread_defs@
- 
-@@ -27,7 +22,7 @@ pkg_LTLIBRARIES  = ipc.la
- 
- ipc_la_SOURCES    = ipc_core.c ipc_misc.c ipc_IPCObject.c ipc_header.h  
- ipc_la_LDFLAGS    = -no-undefined -module -avoid-version
--ipc_la_LIBADD     =
-+ipc_la_LIBADD     = ${top_builddir}/src/libferite.la
- 
- ipc_core.c: @MODULE_SRC_PREFIX@/ipc/ipc.fec 
- 	@BUILDER@ -m ipc @MODULE_SRC_PREFIX@/ipc/ipc.fec
-diff --git a/modules/math/Makefile.am b/modules/math/Makefile.am
-index 21a2ebc..f3a7f09 100644
---- a/modules/math/Makefile.am
-+++ b/modules/math/Makefile.am
-@@ -7,11 +7,6 @@ MAINTAINERCLEANFILES = math*.h math*.c math*~
- 
- CLEANFILES       = 
- 
--if NEED_FERITE_LIB
--libferite = -L${top_builddir}/src -lferite
--endif
--
--LDFLAGS          = $(libferite) -L${libdir} @math_LIBS@
- INCLUDES         = -I$(top_srcdir)/include -I$(prefix)/include -I. @math_CFLAGS@
- DEFS             = @thread_defs@
- 
-@@ -27,7 +22,7 @@ pkg_LTLIBRARIES  = math.la
- 
- math_la_SOURCES    = math_core.c math_misc.c math_Math.c math_Math_Complex.c math_header.h  
- math_la_LDFLAGS    = -no-undefined -module -avoid-version
--math_la_LIBADD     =
-+math_la_LIBADD     = ${top_builddir}/src/libferite.la
- 
- math_core.c: @MODULE_SRC_PREFIX@/math/complex.fec @MODULE_SRC_PREFIX@/math/math.fec 
- 	@BUILDER@ -m math @MODULE_SRC_PREFIX@/math/math.fec
-diff --git a/modules/network/Makefile.am b/modules/network/Makefile.am
-index 91aff1a..d753ed7 100644
---- a/modules/network/Makefile.am
-+++ b/modules/network/Makefile.am
-@@ -7,11 +7,6 @@ MAINTAINERCLEANFILES = network*.h network*.c network*~
- 
- CLEANFILES       = 
- 
--if NEED_FERITE_LIB
--libferite = -L${top_builddir}/src -lferite -L${top_builddir}/modules/stream -lferitestream
--endif
--
--LDFLAGS          = $(libferite) -L${libdir} @network_LIBS@
- INCLUDES         = -I$(top_srcdir)/include -I$(prefix)/include -I. @network_CFLAGS@
- DEFS             = @thread_defs@
- 
-@@ -27,7 +22,7 @@ pkg_LTLIBRARIES  = network.la
- 
- network_la_SOURCES    = network_core.c network_misc.c network_Network.c network_Network_TCP.c network_Network_TCP_Stream.c  network_Network_Host.c network_Network_UDP.c network_Network_UDP_Stream.c network_Network_Service.c network_header.h  util_network.c util_network.h 
- network_la_LDFLAGS    = -no-undefined -module -avoid-version
--network_la_LIBADD     =
-+network_la_LIBADD     = ${top_builddir}/modules/stream/libferitestream.la
- 
- network_core.c: @MODULE_SRC_PREFIX@/network/network.fec 
- 	@BUILDER@ -m network @MODULE_SRC_PREFIX@/network/network.fec
-diff --git a/modules/number/Makefile.am b/modules/number/Makefile.am
-index 6a39962..1203c68 100644
---- a/modules/number/Makefile.am
-+++ b/modules/number/Makefile.am
-@@ -7,11 +7,6 @@ MAINTAINERCLEANFILES = number*.h number*.c number*~
- 
- CLEANFILES       = 
- 
--if NEED_FERITE_LIB
--libferite = -L${top_builddir}/src -lferite
--endif
--
--LDFLAGS          = $(libferite) -L${libdir} @number_LIBS@
- INCLUDES         = -I$(top_srcdir)/include -I$(prefix)/include -I. @number_CFLAGS@
- DEFS             = @thread_defs@
- 
-@@ -27,7 +22,7 @@ pkg_LTLIBRARIES  = number.la
- 
- number_la_SOURCES    = number_core.c number_misc.c number_Number.c number_header.h  
- number_la_LDFLAGS    = -no-undefined -module -avoid-version
--number_la_LIBADD     =
-+number_la_LIBADD     = ${top_builddir}/src/libferite.la
- 
- number_core.c: @MODULE_SRC_PREFIX@/number/number.fec 
- 	@BUILDER@ -m number @MODULE_SRC_PREFIX@/number/number.fec
-diff --git a/modules/posix/Makefile.am b/modules/posix/Makefile.am
-index 8c5d8e9..bfd96fa 100644
---- a/modules/posix/Makefile.am
-+++ b/modules/posix/Makefile.am
-@@ -7,11 +7,6 @@ MAINTAINERCLEANFILES = posix*.h posix*.c posix*~
- 
- CLEANFILES       = 
- 
--if NEED_FERITE_LIB
--libferite = -L${top_builddir}/src -lferite -L${top_builddir}/modules/stream -lferitestream
--endif
--
--LDFLAGS          = $(libferite) -L${libdir} @posix_LIBS@
- INCLUDES         = -I$(top_srcdir)/include -I$(prefix)/include -I. @posix_CFLAGS@
- DEFS             = @thread_defs@
- 
-@@ -27,7 +22,7 @@ pkg_LTLIBRARIES  = posix.la
- 
- posix_la_SOURCES    = posix_core.c posix_misc.c posix_Posix.c posix_Posix_Uname.c posix_Posix_Rlimit.c posix_Posix_User.c posix_Posix_Pipe.c posix_Posix_Rusage.c posix_Posix_ProcessStream.c posix_Posix_Stat.c posix_Posix_SelectResult.c posix_Posix_Group.c posix_header.h  util_posix.c util_posix.h util_user.c util_user.h util_signal.c util_signal.h
- posix_la_LDFLAGS    = -no-undefined -module -avoid-version
--posix_la_LIBADD     =
-+posix_la_LIBADD     = ${top_builddir}/modules/stream/libferitestream.la
- 
- posix_core.c: @MODULE_SRC_PREFIX@/posix/posix.fec @MODULE_SRC_PREFIX@/posix/posix_consts.fec
- 	@BUILDER@ -m posix @MODULE_SRC_PREFIX@/posix/posix.fec
-diff --git a/modules/reflection/Makefile.am b/modules/reflection/Makefile.am
-index 8d02b47..0509819 100644
---- a/modules/reflection/Makefile.am
-+++ b/modules/reflection/Makefile.am
-@@ -7,11 +7,6 @@ MAINTAINERCLEANFILES = reflection*.h reflection*.c reflection*~
- 
- CLEANFILES       = 
- 
--if NEED_FERITE_LIB
--libferite = -L${top_builddir}/src -lferite
--endif
--
--LDFLAGS          = $(libferite) -L${libdir} @reflection_LIBS@
- INCLUDES         = -I$(top_srcdir)/include -I$(prefix)/include -I. @reflection_CFLAGS@
- DEFS             = @thread_defs@
- 
-@@ -27,7 +22,7 @@ pkg_LTLIBRARIES  = reflection.la
- 
- reflection_la_SOURCES    = reflection_core.c reflection_misc.c reflection_Reflection.c reflection_Namespace.c reflection_Function.c reflection_Class.c reflection_Variable.c reflection_Object.c reflection_header.h  utility.c 
- reflection_la_LDFLAGS    = -no-undefined -module -avoid-version
--reflection_la_LIBADD     =
-+reflection_la_LIBADD     = ${top_builddir}/src/libferite.la
- 
- reflection_core.c: @MODULE_SRC_PREFIX@/reflection/reflection.fec 
- 	@BUILDER@ -m reflection @MODULE_SRC_PREFIX@/reflection/reflection.fec
-diff --git a/modules/regexp/Makefile.am b/modules/regexp/Makefile.am
-index 9bf9df6..4bf74be 100644
---- a/modules/regexp/Makefile.am
-+++ b/modules/regexp/Makefile.am
-@@ -7,11 +7,6 @@ MAINTAINERCLEANFILES = regexp*.h regexp*.c regexp*~
- 
- CLEANFILES       = 
- 
--if NEED_FERITE_LIB
--libferite = -L${top_builddir}/src -lferite
--endif
--
--LDFLAGS          = $(libferite) -L${libdir} @regexp_LIBS@
- INCLUDES         = -I$(top_srcdir)/include -I$(prefix)/include -I. @regexp_CFLAGS@
- DEFS             = @thread_defs@
- 
-@@ -27,7 +22,7 @@ pkg_LTLIBRARIES  = regexp.la
- 
- regexp_la_SOURCES    = regexp_core.c regexp_misc.c regexp_MatchObject.c regexp_Regexp.c regexp_header.h  
- regexp_la_LDFLAGS    = -no-undefined -module -avoid-version
--regexp_la_LIBADD     =
-+regexp_la_LIBADD     = ${top_builddir}/src/libferite.la
- 
- regexp_core.c: @MODULE_SRC_PREFIX@/regexp/regexp.fec  
- 	@BUILDER@ -m regexp @MODULE_SRC_PREFIX@/regexp/regexp.fec
-diff --git a/modules/serialize/Makefile.am b/modules/serialize/Makefile.am
-index 0d40c38..ac58c8a 100644
---- a/modules/serialize/Makefile.am
-+++ b/modules/serialize/Makefile.am
-@@ -7,11 +7,6 @@ MAINTAINERCLEANFILES = serialize*.h serialize*.c serialize*~
- 
- CLEANFILES       = 
- 
--if NEED_FERITE_LIB
--libferite = -L${top_builddir}/src -lferite
--endif
--
--LDFLAGS          = $(libferite) -L${libdir} @serialize_LIBS@
- INCLUDES         = -I$(top_srcdir)/include -I$(prefix)/include -I. @serialize_CFLAGS@
- DEFS             = @thread_defs@
- 
-@@ -27,7 +22,7 @@ pkg_LTLIBRARIES  = serialize.la
- 
- serialize_la_SOURCES    = serialize_core.c serialize_misc.c serialize_Serialize.c serialize_header.h  utility.c utility.h 
- serialize_la_LDFLAGS    = -no-undefined -module -avoid-version
--serialize_la_LIBADD     =
-+serialize_la_LIBADD     = ${top_builddir}/src/libferite.la
- 
- serialize_core.c: @MODULE_SRC_PREFIX@/serialize/serialize.fec 
- 	@BUILDER@ -m serialize @MODULE_SRC_PREFIX@/serialize/serialize.fec
-diff --git a/modules/stream/Makefile.am b/modules/stream/Makefile.am
-index 5f6adf1..1ed7e61 100644
---- a/modules/stream/Makefile.am
-+++ b/modules/stream/Makefile.am
-@@ -7,18 +7,12 @@ MAINTAINERCLEANFILES = stream*.h stream*.c stream*~
- 
- CLEANFILES       = 
- 
--if NEED_FERITE_LIB
--libferite = -L${top_builddir}/src -lferite
--endif
--
--LDFLAGS          = $(libferite) -L${libdir} @stream_LIBS@
- INCLUDES         = -I$(top_srcdir)/include -I$(prefix)/include -I. @stream_CFLAGS@
- DEFS             = @thread_defs@
- 
- lib_LTLIBRARIES  = libferitestream.la
- libferitestream_la_SOURCES = util_stream.c
--libferitestream_la_LIBADD       = $(LDFLAGS)	 
--libferitestream_la_DEPENDENCIES = 
-+libferitestream_la_LIBADD       = ${top_builddir}/src/libferite.la
- libferitestream_la_LDFLAGS      = -version-info 1:0:0 -export-dynamic -no-undefined
- 
- fsl_DATA         = util_stream.h
-@@ -36,7 +30,7 @@ pkg_LTLIBRARIES  = stream.la
- 
- stream_la_SOURCES    = stream_core.c stream_misc.c stream_Stream.c stream_Stream_Stream.c stream_Stream_StdioStream.c stream_Stream_StringStream.c stream_Stream_PointerObject.c stream_header.h  util_stream.c util_stream.h 
- stream_la_LDFLAGS    = -no-undefined -module -avoid-version  -L. -lferitestream
--stream_la_LIBADD     =
-+stream_la_LIBADD     = libferitestream.la
- 
- stream_core.c: @MODULE_SRC_PREFIX@/stream/stream.fec
- 	@BUILDER@ -m stream @MODULE_SRC_PREFIX@/stream/stream.fec
-diff --git a/modules/string/Makefile.am b/modules/string/Makefile.am
-index 851d2ff..ff83887 100644
---- a/modules/string/Makefile.am
-+++ b/modules/string/Makefile.am
-@@ -7,11 +7,6 @@ MAINTAINERCLEANFILES = string*.h string*.c string*~
- 
- CLEANFILES       = 
- 
--if NEED_FERITE_LIB
--libferite = -L${top_builddir}/src -lferite
--endif
--
--LDFLAGS          = $(libferite) -L${libdir} @string_LIBS@
- INCLUDES         = -I$(top_srcdir)/include -I$(prefix)/include -I. @string_CFLAGS@
- DEFS             = @thread_defs@
- 
-@@ -27,7 +22,7 @@ pkg_LTLIBRARIES  = string.la
- 
- string_la_SOURCES    = string_core.c string_misc.c string_String.c string_header.h  
- string_la_LDFLAGS    = -no-undefined -module -avoid-version
--string_la_LIBADD     =
-+string_la_LIBADD     = ${top_builddir}/src/libferite.la
- 
- string_core.c: @MODULE_SRC_PREFIX@/string/string.fec 
- 	@BUILDER@ -m string @MODULE_SRC_PREFIX@/string/string.fec
-diff --git a/modules/sys/Makefile.am b/modules/sys/Makefile.am
-index ac60b56..01c7e8f 100644
---- a/modules/sys/Makefile.am
-+++ b/modules/sys/Makefile.am
-@@ -7,11 +7,6 @@ MAINTAINERCLEANFILES = sys*.h sys*.c sys*~
- 
- CLEANFILES       = 
- 
--if NEED_FERITE_LIB
--libferite = -L${top_builddir}/src -lferite -L${top_builddir}/modules/stream -lferitestream
--endif
--
--LDFLAGS          = $(libferite) -L${libdir} @sys_LIBS@
- INCLUDES         = -I$(top_srcdir)/include -I$(prefix)/include -I. @sys_CFLAGS@
- DEFS             = @thread_defs@
- 
-@@ -27,7 +22,7 @@ pkg_LTLIBRARIES  = sys.la
- 
- sys_la_SOURCES    = sys_core.c sys_misc.c sys_Sys.c sys_Sys_env.c sys_header.h   
- sys_la_LDFLAGS    = -no-undefined -module -avoid-version
--sys_la_LIBADD     =
-+sys_la_LIBADD     = ${top_builddir}/modules/stream/libferitestream.la
- 
- sys_core.c: @MODULE_SRC_PREFIX@/sys/env.fec @MODULE_SRC_PREFIX@/sys/std.fec @MODULE_SRC_PREFIX@/sys/sys.fec
- 	@BUILDER@ -m sys @MODULE_SRC_PREFIX@/sys/sys.fec
-diff --git a/modules/test/Makefile.am b/modules/test/Makefile.am
-index aeb7940..b99b0de 100644
---- a/modules/test/Makefile.am
-+++ b/modules/test/Makefile.am
-@@ -7,11 +7,6 @@ MAINTAINERCLEANFILES = test*.h test*.c test*~
- 
- CLEANFILES       = 
- 
--if NEED_FERITE_LIB
--libferite = -L${top_builddir}/src -lferite
--endif
--
--LDFLAGS          = $(libferite) -L${libdir} @test_LIBS@
- INCLUDES         = -I$(top_srcdir)/include -I$(prefix)/include -I. @test_CFLAGS@
- DEFS             = @thread_defs@
- 
-@@ -27,7 +22,7 @@ pkg_LTLIBRARIES  = test.la
- 
- test_la_SOURCES    = test_core.c test_misc.c test_Test.c test_header.h  utility.c utility.h 
- test_la_LDFLAGS    = -no-undefined -module -avoid-version
--test_la_LIBADD     =
-+test_la_LIBADD     = ${top_builddir}/src/libferite.la
- 
- test_core.c: @MODULE_SRC_PREFIX@/test/test.fec 
- 	@BUILDER@ -m test @MODULE_SRC_PREFIX@/test/test.fec
-diff --git a/modules/thread/Makefile.am b/modules/thread/Makefile.am
-index 3d6cfb2..c5438e4 100644
---- a/modules/thread/Makefile.am
-+++ b/modules/thread/Makefile.am
-@@ -7,11 +7,6 @@ MAINTAINERCLEANFILES = thread*.h thread*.c thread*~
- 
- CLEANFILES       = 
- 
--if NEED_FERITE_LIB
--libferite = -L${top_builddir}/src -lferite
--endif
--
--LDFLAGS          = $(libferite) -L${libdir} @thread_LIBS@
- INCLUDES         = -I$(top_srcdir)/include -I$(prefix)/include -I. @thread_CFLAGS@
- DEFS             = @thread_defs@
- 
-@@ -27,7 +22,7 @@ pkg_LTLIBRARIES  = thread.la
- 
- thread_la_SOURCES    = thread_core.c thread_misc.c thread_Thread.c thread_Mutex.c thread_Event.c thread_header.h  utility.c 
- thread_la_LDFLAGS    = -no-undefined -module -avoid-version
--thread_la_LIBADD     =
-+thread_la_LIBADD     = ${top_builddir}/src/libferite.la
- 
- thread_core.c: @MODULE_SRC_PREFIX@/thread/thread.fec 
- 	@BUILDER@ -m thread @MODULE_SRC_PREFIX@/thread/thread.fec
-diff --git a/modules/unix/Makefile.am b/modules/unix/Makefile.am
-index 7999784..8fea3e7 100644
---- a/modules/unix/Makefile.am
-+++ b/modules/unix/Makefile.am
-@@ -7,11 +7,6 @@ MAINTAINERCLEANFILES = unix*.h unix*.c unix*~
- 
- CLEANFILES       = 
- 
--if NEED_FERITE_LIB
--libferite = -L${top_builddir}/src -lferite -L${top_builddir}/modules/stream -lferitestream
--endif
--
--LDFLAGS          = $(libferite) -L${libdir} @unix_LIBS@
- INCLUDES         = -I$(top_srcdir)/include -I$(prefix)/include -I. @unix_CFLAGS@
- DEFS             = @thread_defs@
- 
-@@ -27,7 +22,7 @@ pkg_LTLIBRARIES  = unix.la
- 
- unix_la_SOURCES    = unix_core.c unix_misc.c unix_Unix.c unix_Unix_SyslogStream.c unix_Network.c unix_Network_Unix.c unix_Network_Unix_Stream.c unix_header.h  
- unix_la_LDFLAGS    = -no-undefined -module -avoid-version
--unix_la_LIBADD     =
-+unix_la_LIBADD     = ${top_builddir}/modules/stream/libferitestream.la
- 
- unix_core.c: @MODULE_SRC_PREFIX@/unix/unix.fec @MODULE_SRC_PREFIX@/unix/syslog.fec @MODULE_SRC_PREFIX@/unix/unixsocket.fec
- 	@BUILDER@ -m unix @MODULE_SRC_PREFIX@/unix/unix.fec
-diff --git a/modules/xml/Makefile.am b/modules/xml/Makefile.am
-index 71a88a9..26c7cbb 100644
---- a/modules/xml/Makefile.am
-+++ b/modules/xml/Makefile.am
-@@ -7,11 +7,6 @@ MAINTAINERCLEANFILES = xml*.h xml*.c xml*~~
- 
- CLEANFILES       = 
- 
--if NEED_FERITE_LIB
--libferite = -L${top_builddir}/src -lferite
--endif
--
--LDFLAGS          = $(libferite) -L${libdir} @xml_LIBS@
- INCLUDES         = -I$(top_srcdir)/include -I$(prefix)/include -I. @xml_CFLAGS@
- DEFS             = @thread_defs@
- 
-@@ -27,7 +22,7 @@ pkg_LTLIBRARIES  = xml.la
- 
- xml_la_SOURCES    = xml_core.c xml_misc.c xml_XML.c xml_XML_SAXParser.c xml_XML_TreeParser.c xml_header.h  sax_handlers.c sax_handlers.h tree_handlers.c tree_handlers.h xpath_handlers.c xpath_handlers.h xml_XML_Element.c
- xml_la_LDFLAGS    = -no-undefined -module -avoid-version
--xml_la_LIBADD     =
-+xml_la_LIBADD     = ${top_builddir}/src/libferite.la @xml_LIBS@
- 
- xml_core.c: @MODULE_SRC_PREFIX@/xml/xml.fec 
- 	@BUILDER@ -m xml @MODULE_SRC_PREFIX@/xml/xml.fec
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 01c8649..fa2e41e 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -8,8 +8,6 @@ MAINTAINERCLEANFILES = Makefile.in
- 
- CLEANFILES       = *~
- 
--LDFLAGS		     = -L${prefix}/lib -lm
--
- INCLUDES	     = -I$(top_srcdir) -I$(top_srcdir)/libs/aphex/include -I$(top_srcdir)/libs/triton/include -I${top_srcdir}/include -I${prefix}/include -I$(includedir) -I${top_srcdir}/include/ferite/ @pcre_cflags@
- 
- DEFS                 = @debugdefs@ @thread_defs@ @gc_defs@
-@@ -69,6 +67,6 @@ EXTRA_DIST = ferite_parser.y ferite_scanner.l
- 
- libferite_la_LIBADD       = $(top_builddir)/libs/triton/src/libtriton.la \
-                             $(top_builddir)/libs/aphex/src/libaphex.la \
--							-lm @pcre_libs@ @thread_libs@ @gc_libs@ $(LDFLAGS)	 
-+                            -lm @pcre_libs@ @thread_libs@ @gc_libs@
- libferite_la_DEPENDENCIES = $(top_builddir)/config.h $(top_builddir)/libs/triton/src/libtriton.la $(top_builddir)/libs/aphex/src/libaphex.la
- libferite_la_LDFLAGS      = -version-info 1:1:0 -export-dynamic -no-undefined