[syslog-ng] linking changes

[Corinna Vinschen]

On Feb 23 15:18, Corinna Vinschen wrote:
> diff --git a/modules/dbparser/Makefile.am b/modules/dbparser/Makefile.am
> index b2ab700..f8a53f4 100644
> --- a/modules/dbparser/Makefile.am
> +++ b/modules/dbparser/Makefile.am
> @@ -21,7 +21,8 @@ libsyslog_ng_patterndb_a_CFLAGS = $(AM_CFLAGS) -fPIC
>  module_LTLIBRARIES = libdbparser.la
>  libdbparser_la_SOURCES = \
>  	dbparser.c dbparser.h \
> -	dbparser-grammar.y dbparser-parser.c dbparser-parser.h dbparser-plugin.c
> +	dbparser-grammar.y dbparser-parser.c dbparser-parser.h \
> +	dbparser-plugin.c $(libsyslog_ng_patterndb_a_SOURCES)
>  
>  libdbparser_la_CPPFLAGS = $(AM_CPPFLAGS)
>  libdbparser_la_LIBADD = ../../lib/libsyslog-ng.la libsyslog-ng-patterndb.a

Of course, libsyslog-ng-patterndb.a has to be removed from
libdbparser_la_LIBADD, and the dependencies have to be added, so the
full patch against current git HEAD would look like this:

Signed-off-by: Corinna Vinschen <vinschen at redhat.com>

diff --git a/modules/dbparser/Makefile.am b/modules/dbparser/Makefile.am
index b2ab700..417c8b7 100644
--- a/modules/dbparser/Makefile.am
+++ b/modules/dbparser/Makefile.am
@@ -11,7 +11,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/lib -I../../lib
 AM_CFLAGS = @CFLAGS_NOWARN_POINTER_SIGN@
 export top_srcdir
 
-lib_LIBRARIES = libsyslog-ng-patterndb.a
+noinst_LIBRARIES = libsyslog-ng-patterndb.a
 libsyslog_ng_patterndb_a_SOURCES = radix.c radix.h \
 	patterndb.c patterndb.h patterndb-int.h \
 	timerwheel.c timerwheel.h \
@@ -21,16 +21,17 @@ libsyslog_ng_patterndb_a_CFLAGS = $(AM_CFLAGS) -fPIC
 module_LTLIBRARIES = libdbparser.la
 libdbparser_la_SOURCES = \
 	dbparser.c dbparser.h \
-	dbparser-grammar.y dbparser-parser.c dbparser-parser.h dbparser-plugin.c
+	dbparser-grammar.y dbparser-parser.c dbparser-parser.h \
+	dbparser-plugin.c $(libsyslog_ng_patterndb_a_SOURCES)
 
 libdbparser_la_CPPFLAGS = $(AM_CPPFLAGS)
-libdbparser_la_LIBADD = ../../lib/libsyslog-ng.la libsyslog-ng-patterndb.a
+libdbparser_la_LIBADD = ../../lib/libsyslog-ng.la @OPENSSL_LIBS@
 libdbparser_la_LDFLAGS = -avoid-version -module -no-undefined
 
 bin_PROGRAMS = pdbtool
 pdbtool_SOURCES = pdbtool.c
 pdbtool_CPPFLAGS = $(AM_CPPFLAGS) @OPENSSL_CFLAGS@
-pdbtool_LDADD = ../../lib/libsyslog-ng.la libsyslog-ng-patterndb.a @TOOL_DEPS_LIBS@ @OPENSSL_LIBS@
+pdbtool_LDADD = libsyslog-ng-patterndb.a ../../lib/libsyslog-ng.la @TOOL_DEPS_LIBS@ @OPENSSL_LIBS@
 
 BUILT_SOURCES = dbparser-grammar.y dbparser-grammar.c dbparser-grammar.h
 EXTRA_DIST = $(BUILT_SOURCES) radix-find.c dbparser-grammar.ym

I'm just testing this on Cygwin.  Hang on...

[...time passes...]

Yes, that works.  I hope that's ok to check in.


Corinna

-- 
Corinna Vinschen
Cygwin Project Co-Leader
Red Hat