diff --git a/src/Makefile.am b/src/Makefile.am
index 7cff3e8a5b5dafc05568cc41c6ab8f435de6a46d..ddd856cd6b8e858b936132d27a617a67025b58e6 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
AM_CFLAGS = @STRICT_CFLAGS@ @COVERAGE_CFLAGS@ @PROFILING_CFLAGS@
AM_CXXFLAGS = @STRICT_CXXFLAGS@ @COVERAGE_CFLAGS@ @PROFILING_CFLAGS@
AM_LDFLAGS = @COVERAGE_LDFLAGS@ @PROFILING_LDFLAGS@
-AM_CPPFLAGS = -I"${top_srcdir}/src/include"
+AM_CPPFLAGS = -I${top_builddir}/src/include -I${top_srcdir}/src/include
AM_CPPFLAGS += -DSYSCONFDIR='"${sysconfdir}"'
AM_CPPFLAGS += -DLOCALSTATEDIR='"${localstatedir}"'
AM_CPPFLAGS += -DPKGLIBDIR='"${pkglibdir}"'
include/utils/llist.h \
include/utils/os.h \
include/utils/proto.h \
+ include/utils/ssl.h \
include/utils/strbuf.h \
include/utils/unixsock.h
client/sock.c include/client/sock.h \
utils/error.c include/utils/error.h \
utils/proto.c include/utils/proto.h \
+ utils/ssl.c include/utils/ssl.h \
utils/strbuf.c include/utils/strbuf.h
-libsysdbclient_la_CFLAGS = $(AM_CFLAGS)
+libsysdbclient_la_CFLAGS = $(AM_CFLAGS) @OPENSSL_CFLAGS@
libsysdbclient_la_CPPFLAGS = $(AM_CPPFLAGS) $(LTDLINCL)
libsysdbclient_la_LDFLAGS = $(AM_LDFLAGS) -version-info 0:0:0 \
-pthread -lm -lrt
-libsysdbclient_la_LIBADD = $(LIBLTDL)
+libsysdbclient_la_LIBADD = $(LIBLTDL) @OPENSSL_LIBS@
# don't use strict CFLAGS for flex code
noinst_LTLIBRARIES += libsysdb_fe_parser.la
utils/llist.c include/utils/llist.h \
utils/os.c include/utils/os.h \
utils/proto.c include/utils/proto.h \
+ utils/ssl.c include/utils/ssl.h \
utils/strbuf.c include/utils/strbuf.h \
utils/unixsock.c include/utils/unixsock.h
-libsysdb_la_CFLAGS = $(AM_CFLAGS)
+libsysdb_la_CFLAGS = $(AM_CFLAGS) @OPENSSL_CFLAGS@
libsysdb_la_CPPFLAGS = $(AM_CPPFLAGS) $(LTDLINCL)
libsysdb_la_LDFLAGS = $(AM_LDFLAGS) -version-info 0:0:0 \
-pthread -lm -lrt
libsysdb_la_LIBADD = libsysdb_fe_parser.la \
- $(LIBLTDL) liboconfig/liboconfig.la
+ $(LIBLTDL) liboconfig/liboconfig.la @OPENSSL_LIBS@
libsysdb_la_DEPENDENCIES = libsysdb_fe_parser.la liboconfig/liboconfig.la
if BUILD_WITH_LIBDBI
sysdbd_SOURCES = tools/sysdbd/main.c include/sysdb.h \
tools/sysdbd/configfile.c tools/sysdbd/configfile.h \
$(libsysdb_la_SOURCES)
-sysdbd_CFLAGS = $(AM_CFLAGS) -DBUILD_DATE="\"$$( date --utc '+%F %T' ) (UTC)\""
+sysdbd_CFLAGS = $(AM_CFLAGS) @OPENSSL_CFLAGS@ \
+ -DBUILD_DATE="\"$$( date --utc '+%F %T' ) (UTC)\""
sysdbd_CPPFLAGS = $(AM_CPPFLAGS) $(LTDLINCL)
sysdbd_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -pthread -lm
sysdbd_LDADD = libsysdb_fe_parser.la liboconfig/liboconfig.la \
- $(LIBLTDL) -lrt
+ $(LIBLTDL) -lrt @OPENSSL_LIBS@
sysdbd_DEPENDENCIES = libsysdb_fe_parser.la liboconfig/liboconfig.la
if BUILD_WITH_LIBDBI
sysdbd_DEPENDENCIES += plugins/store/network.la
endif
-include/client/sysdb.h: include/client/sysdb.h.in ../version
- source ../version; sed \
+include/client/sysdb.h: include/client/sysdb.h.in $(abs_top_builddir)/version
+ mkdir -p include/client
+ source $(abs_top_builddir)/version; sed \
-e "s/@SDB_VERSION_MAJOR@/$$VERSION_MAJOR/g" \
-e "s/@SDB_VERSION_MINOR@/$$VERSION_MINOR/g" \
-e "s/@SDB_VERSION_PATCH@/$$VERSION_PATCH/g" \
-e "s/@SDB_VERSION_EXTRA@/$$VERSION_EXTRA/g" \
-e "s/@SDB_VERSION_STRING@/$$VERSION_STRING/g" \
- include/client/sysdb.h.in > include/client/sysdb.h
+ $(srcdir)/include/client/sysdb.h.in \
+ > include/client/sysdb.h
-include/sysdb.h: include/sysdb.h.in ../version
- source ../version; sed \
+include/sysdb.h: include/sysdb.h.in $(abs_top_builddir)/version
+ mkdir -p include
+ source $(abs_top_builddir)/version; sed \
-e "s/@SDB_VERSION_MAJOR@/$$VERSION_MAJOR/g" \
-e "s/@SDB_VERSION_MINOR@/$$VERSION_MINOR/g" \
-e "s/@SDB_VERSION_PATCH@/$$VERSION_PATCH/g" \
-e "s/@SDB_VERSION_EXTRA@/$$VERSION_EXTRA/g" \
-e "s/@SDB_VERSION_STRING@/$$VERSION_STRING/g" \
- include/sysdb.h.in > include/sysdb.h
+ $(srcdir)/include/sysdb.h.in \
+ > include/sysdb.h
-../version:
+$(abs_top_builddir)/version:
cd .. && make version