← Back to branch summary

~ubuntu-branches/ubuntu/trusty/syslog-ng/trusty-proposed

« back to all changes in this revision

Viewing changes to lib/Makefile.am

  • Committer: Package Import Robot
  • Author(s): Laszlo Boszormenyi (GCS)
  • Date: 2013-05-26 09:06:21 UTC
  • mfrom: (1.3.11)
  • Revision ID: package-import@ubuntu.com-20130526090621-8z2s0oi21eoljb9x
Tags: 3.3.9-1
http://bugs.debian.org/708793
* New upstream release.
* Include missed ivykis header (closes: #708793).

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/Makefile.am
11
11
libsyslog_ng_la_LIBADD = @CORE_DEPS_LIBS@
12
12
libsyslog_ng_la_LDFLAGS = -no-undefined -release @VERSION@
13
13
 
14
 
module_LTLIBRARIES = libsyslog-ng-crypto.la
15
 
libsyslog_ng_crypto_la_LIBADD = @SYSLOGNG_DEPS_LIBS@ @OPENSSL_LIBS@ libsyslog-ng.la
16
 
libsyslog_ng_crypto_la_LDFLAGS = -no-undefined -avoid-version
17
 
 
18
14
# this is intentionally formatted so conflicts are less likely to arise. one name in every line.
19
15
pkginclude_HEADERS =            \
20
16
        afinter.h               \
82
78
        value-pairs.h
83
79
 
84
80
# this is intentionally formatted so conflicts are less likely to arise. one name in every line.
85
 
libsyslog_ng_crypto_la_SOURCES = \
 
81
libsyslog_ng_crypto_la_sources = \
86
82
        crypto.c                \
87
83
        tlscontext.c            \
88
84
        tlstransport.c
155
151
        parser-expr-grammar.y   \
156
152
        rewrite-expr-grammar.y
157
153
 
 
154
if WITH_EMBEDDED_CRYPTO
 
155
libsyslog_ng_la_LIBADD += @OPENSSL_LIBS@
 
156
libsyslog_ng_la_SOURCES += ${libsyslog_ng_crypto_la_sources}
 
157
else
 
158
module_LTLIBRARIES = libsyslog-ng-crypto.la
 
159
libsyslog_ng_crypto_la_LIBADD = @SYSLOGNG_DEPS_LIBS@ @OPENSSL_LIBS@ libsyslog-ng.la
 
160
libsyslog_ng_crypto_la_LDFLAGS = -no-undefined -avoid-version
 
161
libsyslog_ng_crypto_la_SOURCES = ${libsyslog_ng_crypto_la_sources}
 
162
endif
 
163
 
158
164
# each line with closely related files (e.g. the ones generated from the same source)
159
165
BUILT_SOURCES = cfg-lex.c cfg-lex.h                                             \
160
166
        cfg-grammar.c cfg-grammar.h                                             \