X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2FMakefile.am;h=6b560df7b8b2bc6c56d6615c7b7e516dc8129fd2;hp=7cff3e8a5b5dafc05568cc41c6ab8f435de6a46d;hb=cc35394b0c4af9ccfbe7b0a18713758a9f29d247;hpb=fd919402b261f5e07e2348a7f22262893f41daf1

diff --git a/src/Makefile.am b/src/Makefile.am
index 7cff3e8..6b560df 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,7 +4,7 @@ SUBDIRS = liboconfig
 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}"'
@@ -12,7 +12,7 @@ AM_CPPFLAGS += -DPKGLIBDIR='"${pkglibdir}"'
 AM_YFLAGS = -d
 
 BUILT_SOURCES = include/client/sysdb.h include/sysdb.h \
-		frontend/grammar.h
+		frontend/grammar.h parser/grammar.h
 EXTRA_DIST = include/client/sysdb.h.in include/sysdb.h.in
 
 pkginclude_HEADERS = include/sysdb.h
@@ -39,6 +39,7 @@ pkgutilsinclude_HEADERS = \
 		include/utils/llist.h \
 		include/utils/os.h \
 		include/utils/proto.h \
+		include/utils/ssl.h \
 		include/utils/strbuf.h \
 		include/utils/unixsock.h
 
@@ -56,17 +57,19 @@ libsysdbclient_la_SOURCES = \
 		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
 libsysdb_fe_parser_la_SOURCES = \
-		frontend/grammar.y frontend/scanner.l
+		frontend/grammar.y frontend/scanner.l \
+		parser/grammar.y parser/scanner.l
 libsysdb_fe_parser_la_CFLAGS = @COVERAGE_CFLAGS@ @PROFILING_CFLAGS@ \
 		-DBUILD_DATE="\"$$( date --utc '+%F %T' ) (UTC)\""
 libsysdb_la_SOURCES = \
@@ -78,6 +81,7 @@ libsysdb_la_SOURCES = \
 		core/store_expr.c \
 		core/store_json.c \
 		core/store_lookup.c \
+		core/store_query.c \
 		core/data.c include/core/data.h \
 		core/time.c include/core/time.h \
 		core/timeseries.c include/core/timeseries.h \
@@ -89,20 +93,24 @@ libsysdb_la_SOURCES = \
 		frontend/session.c \
 		frontend/store.c \
 		frontend/query.c \
+		parser/analyzer.c \
+		parser/ast.c include/parser/ast.h \
+		parser/parser.c include/parser/parser.h \
 		utils/avltree.c include/utils/avltree.h \
 		utils/channel.c include/utils/channel.h \
 		utils/error.c include/utils/error.h \
 		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
@@ -134,11 +142,12 @@ endif
 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
@@ -228,23 +237,27 @@ sysdbd_LDADD += -dlopen plugins/store/network.la
 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