From 6bc2df868638b7d864cecfe00586f2ae503e51e1 Mon Sep 17 00:00:00 2001 From: Georg Hopp Date: Wed, 2 Oct 2013 20:35:09 +0100 Subject: [PATCH] use dragonegg config --- configure.ac | 7 +++++-- src/Makefile.am | 1 + src/application/Makefile.am | 2 +- src/asset/Makefile.am | 2 +- src/auth/Makefile.am | 2 +- src/cbuf/Makefile.am | 2 +- src/class/Makefile.am | 2 +- src/hash/Makefile.am | 2 +- src/http/Makefile.am | 2 +- src/logger/Makefile.am | 2 +- src/queue/Makefile.am | 2 +- src/server/Makefile.am | 2 +- src/session/Makefile.am | 2 +- src/socket/Makefile.am | 2 +- src/storage/Makefile.am | 2 +- src/stream/Makefile.am | 2 +- src/tree/Makefile.am | 2 +- src/user/Makefile.am | 2 +- 18 files changed, 22 insertions(+), 18 deletions(-) diff --git a/configure.ac b/configure.ac index 542ce32..c6c2210 100644 --- a/configure.ac +++ b/configure.ac @@ -6,9 +6,9 @@ AC_INIT([taskrambler], [0.1.6], [Georg Hopp ]) LT_INIT AM_INIT_AUTOMAKE #AM_INIT_AUTOMAKE([subdir-objects]) -AM_SILENT_RULES([yes]) +#AM_SILENT_RULES([yes]) AC_COPYRIGHT([Copyright © 2013 Georg Hopp]) -AC_REVISION([$Revision: 0.02 $]) +AC_REVISION([$Id:$]) AC_CONFIG_SRCDIR([src/taskrambler.c]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([m4]) @@ -22,6 +22,9 @@ AC_SUBST(COVERAGE_LDFLAGS) m4_include([m4/memopt.m4]) AC_MEM_OPT +m4_include([m4/dragonegg.m4]) +AC_DRAGONEGG + PWD=$(/bin/pwd) AC_SUBST(PWD) diff --git a/src/Makefile.am b/src/Makefile.am index ffbd51f..32ef9d3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -35,6 +35,7 @@ bin_PROGRAMS = taskrambler taskrambler_SOURCES = taskrambler.c $(IFACE) $(UTILS) taskrambler_CFLAGS = $(CFLAGS) \ + $(DRAGONEGG_FLAGS) \ -Wall \ -DPWD=\"$(PWD)\" \ $(MEM_OPT_FLAGS) \ diff --git a/src/application/Makefile.am b/src/application/Makefile.am index d58a230..eb3dbb8 100644 --- a/src/application/Makefile.am +++ b/src/application/Makefile.am @@ -14,4 +14,4 @@ ADAPTERHTTP = adapter/http/http.c \ noinst_LIBRARIES = libapplication.a libapplication_a_SOURCES = $(APPLICATION) $(ADAPTERHTTP) -libapplication_a_CFLAGS = $(CFLAGS) -Wall -I ../../ -I ../../include/ +libapplication_a_CFLAGS = $(CFLAGS) $(DRAGONEGG_FLAGS) -Wall -I ../../ -I ../../include/ diff --git a/src/asset/Makefile.am b/src/asset/Makefile.am index 0a855ea..98cd248 100644 --- a/src/asset/Makefile.am +++ b/src/asset/Makefile.am @@ -4,4 +4,4 @@ AUTOMAKE_OPTIONS = subdir-objects noinst_LIBRARIES = libasset.a libasset_a_SOURCES = asset.c pool.c -libasset_a_CFLAGS = $(CFLAGS) -Wall -I ../../include/ +libasset_a_CFLAGS = $(CFLAGS) $(DRAGONEGG_FLAGS) -Wall -I ../../include/ diff --git a/src/auth/Makefile.am b/src/auth/Makefile.am index 6a8c9d0..524363a 100644 --- a/src/auth/Makefile.am +++ b/src/auth/Makefile.am @@ -8,4 +8,4 @@ libauth_a_SOURCES = interface/auth.c \ ldap.c \ storage/storage.c \ storage/hash_pw.c -libauth_a_CFLAGS = $(CFLAGS) -Wall -I ../../include/ +libauth_a_CFLAGS = $(CFLAGS) $(DRAGONEGG_FLAGS) -Wall -I ../../include/ diff --git a/src/cbuf/Makefile.am b/src/cbuf/Makefile.am index 69b9f9b..7bbc002 100644 --- a/src/cbuf/Makefile.am +++ b/src/cbuf/Makefile.am @@ -11,4 +11,4 @@ CB = cbuf.c read.c \ noinst_LIBRARIES = libcbuf.a libcbuf_a_SOURCES = $(CB) -libcbuf_a_CFLAGS = $(CFLAGS) -Wall -I ../../include/ +libcbuf_a_CFLAGS = $(CFLAGS) $(DRAGONEGG_FLAGS) -Wall -I ../../include/ diff --git a/src/class/Makefile.am b/src/class/Makefile.am index c7349f2..b8af60b 100644 --- a/src/class/Makefile.am +++ b/src/class/Makefile.am @@ -4,4 +4,4 @@ AUTOMAKE_OPTIONS = subdir-objects noinst_LIBRARIES = libclass.a libclass_a_SOURCES = interface.c interface/i_class.c -libclass_a_CFLAGS = $(CFLAGS) -Wall -I ../../include/ +libclass_a_CFLAGS = $(CFLAGS) $(DRAGONEGG_FLAGS) -Wall -I ../../include/ diff --git a/src/hash/Makefile.am b/src/hash/Makefile.am index 294c8cc..5727bba 100644 --- a/src/hash/Makefile.am +++ b/src/hash/Makefile.am @@ -7,4 +7,4 @@ HASH = hash.c add.c get.c delete.c each.c value.c \ noinst_LIBRARIES = libhash.a libhash_a_SOURCES = $(HASH) -libhash_a_CFLAGS = $(CFLAGS) -Wall -I ../../include/ +libhash_a_CFLAGS = $(CFLAGS) $(DRAGONEGG_FLAGS) -Wall -I ../../include/ diff --git a/src/http/Makefile.am b/src/http/Makefile.am index d4c77bd..176ff2e 100644 --- a/src/http/Makefile.am +++ b/src/http/Makefile.am @@ -42,4 +42,4 @@ noinst_LIBRARIES = libhttp.a libhttp_a_SOURCES = $(MSG) $(REQ) $(RESP) $(PARSER) $(WRITER) \ $(WORKER) $(HEADER) interface/i_http_intro.c -libhttp_a_CFLAGS = $(CFLAGS) -Wall -I ../../ -I ../../include/ +libhttp_a_CFLAGS = $(CFLAGS) $(DRAGONEGG_FLAGS) -Wall -I ../../ -I ../../include/ diff --git a/src/logger/Makefile.am b/src/logger/Makefile.am index d123437..3129465 100644 --- a/src/logger/Makefile.am +++ b/src/logger/Makefile.am @@ -4,4 +4,4 @@ AUTOMAKE_OPTIONS = subdir-objects noinst_LIBRARIES = liblogger.a liblogger_a_SOURCES = interface/i_logger.c logger.c stderr.c syslog.c -liblogger_a_CFLAGS = $(CFLAGS) -Wall -I ../../include/ +liblogger_a_CFLAGS = $(CFLAGS) $(DRAGONEGG_FLAGS) -Wall -I ../../include/ diff --git a/src/queue/Makefile.am b/src/queue/Makefile.am index b5faed2..fa604dd 100644 --- a/src/queue/Makefile.am +++ b/src/queue/Makefile.am @@ -4,4 +4,4 @@ AUTOMAKE_OPTIONS = subdir-objects noinst_LIBRARIES = libqueue.a libqueue_a_SOURCES = queue.c get.c put.c -libqueue_a_CFLAGS = $(CFLAGS) -Wall -I ../../include/ +libqueue_a_CFLAGS = $(CFLAGS) $(DRAGONEGG_FLAGS) -Wall -I ../../include/ diff --git a/src/server/Makefile.am b/src/server/Makefile.am index 1fccbbb..6223abc 100644 --- a/src/server/Makefile.am +++ b/src/server/Makefile.am @@ -7,4 +7,4 @@ SERVER = server.c run.c close_conn.c poll.c \ noinst_LIBRARIES = libserver.a libserver_a_SOURCES = $(SERVER) -libserver_a_CFLAGS = $(CFLAGS) -Wall -I ../../include/ +libserver_a_CFLAGS = $(CFLAGS) $(DRAGONEGG_FLAGS) -Wall -I ../../include/ diff --git a/src/session/Makefile.am b/src/session/Makefile.am index 462b4e8..a0b69b5 100644 --- a/src/session/Makefile.am +++ b/src/session/Makefile.am @@ -4,4 +4,4 @@ AUTOMAKE_OPTIONS = subdir-objects noinst_LIBRARIES = libsession.a libsession_a_SOURCES = session.c -libsession_a_CFLAGS = $(CFLAGS) -Wall -I ../../include/ +libsession_a_CFLAGS = $(CFLAGS) $(DRAGONEGG_FLAGS) -Wall -I ../../include/ diff --git a/src/socket/Makefile.am b/src/socket/Makefile.am index 9b36839..8157bb1 100644 --- a/src/socket/Makefile.am +++ b/src/socket/Makefile.am @@ -4,4 +4,4 @@ AUTOMAKE_OPTIONS = subdir-objects noinst_LIBRARIES = libsocket.a libsocket_a_SOURCES = socket.c accept.c connect.c listen.c nonblock.c -libsocket_a_CFLAGS = $(CFLAGS) -Wall -I ../../include/ +libsocket_a_CFLAGS = $(CFLAGS) $(DRAGONEGG_FLAGS) -Wall -I ../../include/ diff --git a/src/storage/Makefile.am b/src/storage/Makefile.am index b6ea977..1b2aab1 100644 --- a/src/storage/Makefile.am +++ b/src/storage/Makefile.am @@ -4,4 +4,4 @@ AUTOMAKE_OPTIONS = subdir-objects noinst_LIBRARIES = libstorage.a libstorage_a_SOURCES = storage.c get.c put.c update.c -libstorage_a_CFLAGS = $(CFLAGS) -Wall -I ../../include/ +libstorage_a_CFLAGS = $(CFLAGS) $(DRAGONEGG_FLAGS) -Wall -I ../../include/ diff --git a/src/stream/Makefile.am b/src/stream/Makefile.am index 2cb599e..172ff84 100644 --- a/src/stream/Makefile.am +++ b/src/stream/Makefile.am @@ -8,4 +8,4 @@ IFACE = interface/reader.c \ noinst_LIBRARIES = libstream.a libstream_a_SOURCES = $(STREAM) $(IFACE) -libstream_a_CFLAGS = $(CFLAGS) -Wall -I ../../include/ +libstream_a_CFLAGS = $(CFLAGS) $(DRAGONEGG_FLAGS) -Wall -I ../../include/ diff --git a/src/tree/Makefile.am b/src/tree/Makefile.am index b88378b..cb44d61 100644 --- a/src/tree/Makefile.am +++ b/src/tree/Makefile.am @@ -7,4 +7,4 @@ TREE = tree.c find.c insert.c inOrderSuccessor.c delete.c walk.c \ noinst_LIBRARIES = libtree.a libtree_a_SOURCES = $(TREE) -libtree_a_CFLAGS = $(CFLAGS) -Wall -I ../../include/ +libtree_a_CFLAGS = $(CFLAGS) $(DRAGONEGG_FLAGS) -Wall -I ../../include/ diff --git a/src/user/Makefile.am b/src/user/Makefile.am index e3cd065..3d8f82e 100644 --- a/src/user/Makefile.am +++ b/src/user/Makefile.am @@ -4,4 +4,4 @@ AUTOMAKE_OPTIONS = subdir-objects noinst_LIBRARIES = libuser.a libuser_a_SOURCES = user.c load.c save.c -libuser_a_CFLAGS = $(CFLAGS) -Wall -I ../../include/ +libuser_a_CFLAGS = $(CFLAGS) $(DRAGONEGG_FLAGS) -Wall -I ../../include/