From b832eea81c330f857f12f8b68eb13a8f94b255c6 Mon Sep 17 00:00:00 2001 From: Georg Hopp Date: Wed, 21 Aug 2013 16:17:20 +0100 Subject: [PATCH] change build system to accept CFLAGS --- configure.ac | 2 +- m4/gcov.m4 | 4 ++-- src/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/stream/Makefile.am | 2 +- 14 files changed, 15 insertions(+), 15 deletions(-) diff --git a/configure.ac b/configure.ac index fff3090..16bb994 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,7 @@ AC_INIT([taskrambler], [0.0.1], [Georg Hopp ]) LT_INIT AM_INIT_AUTOMAKE #AM_INIT_AUTOMAKE([subdir-objects]) -AM_SILENT_RULES([yes]) +#AM_SILENT_RULES([yes]) AC_COPYRIGHT([Copyright © 2012 Georg Hopp]) AC_REVISION([$Revision: 0.02 $]) AC_CONFIG_SRCDIR([src/taskrambler.c]) diff --git a/m4/gcov.m4 b/m4/gcov.m4 index 1495f86..0f2c580 100644 --- a/m4/gcov.m4 +++ b/m4/gcov.m4 @@ -14,7 +14,7 @@ AC_DEFUN([AC_TDD_GCOV], [use_gcov=$enableval], [use_gcov=no]) AM_CONDITIONAL(HAVE_GCOV, test "x$use_gcov" = "xyes") - # if test "x$use_gcov" = "xyes"; then + if test "x$use_gcov" = "xyes"; then # we need gcc: if test "$GCC" != "yes"; then AC_MSG_ERROR([GCC is required for --enable-gcov]) @@ -72,6 +72,6 @@ AC_DEFUN([AC_TDD_GCOV], COVERAGE_CXXFLAGS="-O0 -fprofile-arcs -ftest-coverage" COVERAGE_LDFLAGS="-lgcov" -#fi +fi ]) # AC_TDD_GCOV diff --git a/src/Makefile.am b/src/Makefile.am index daef328..dbf4342 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -25,7 +25,7 @@ AM_CFLAGS = -Wall -I ../include/ bin_PROGRAMS = taskrambler taskrambler_SOURCES = taskrambler.c $(IFACE) $(UTILS) -taskrambler_CFLAGS = -Wall -DPWD=\"$(PWD)\" -I ../include/# $(COVERAGE_CFLAGS) +taskrambler_CFLAGS = $(CFLAGS) -Wall -DPWD=\"$(PWD)\" -I ../include/# $(COVERAGE_CFLAGS) taskrambler_LDADD = $(LIBS) -lrt -lssl -lldap #taskrambler_LDFLAGS = $(COVERAGE_LDFLAGS) diff --git a/src/auth/Makefile.am b/src/auth/Makefile.am index f35a61c..4c30e86 100644 --- a/src/auth/Makefile.am +++ b/src/auth/Makefile.am @@ -3,4 +3,4 @@ ACLOCAL_AMFLAGS = -I m4 noinst_LIBRARIES = libauth.a libauth_a_SOURCES = interface/auth.c credential.c ldap.c -libauth_a_CFLAGS = -Wall -I ../../include/ +libauth_a_CFLAGS = $(CFLAGS) -Wall -I ../../include/ diff --git a/src/cbuf/Makefile.am b/src/cbuf/Makefile.am index c9d9f29..8254eeb 100644 --- a/src/cbuf/Makefile.am +++ b/src/cbuf/Makefile.am @@ -10,4 +10,4 @@ CB = cbuf.c read.c write.c \ noinst_LIBRARIES = libcbuf.a libcbuf_a_SOURCES = $(CB) -libcbuf_a_CFLAGS = -Wall -I ../../include/ +libcbuf_a_CFLAGS = $(CFLAGS) -Wall -I ../../include/ diff --git a/src/class/Makefile.am b/src/class/Makefile.am index 2b5b0ad..435650b 100644 --- a/src/class/Makefile.am +++ b/src/class/Makefile.am @@ -3,4 +3,4 @@ ACLOCAL_AMFLAGS = -I m4 noinst_LIBRARIES = libclass.a libclass_a_SOURCES = interface.c interface/i_class.c -libclass_a_CFLAGS = -Wall -I ../../include/ +libclass_a_CFLAGS = $(CFLAGS) -Wall -I ../../include/ diff --git a/src/hash/Makefile.am b/src/hash/Makefile.am index 8eb86ff..5fbd9cc 100644 --- a/src/hash/Makefile.am +++ b/src/hash/Makefile.am @@ -6,4 +6,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 = -Wall -I ../../include/ +libhash_a_CFLAGS = $(CFLAGS) -Wall -I ../../include/ diff --git a/src/http/Makefile.am b/src/http/Makefile.am index a7ec689..f583d84 100644 --- a/src/http/Makefile.am +++ b/src/http/Makefile.am @@ -37,4 +37,4 @@ noinst_LIBRARIES = libhttp.a libhttp_a_SOURCES = $(MSG) $(REQ) $(RESP) $(PARSER) $(WRITER) \ $(WORKER) $(HEADER) interface/i_http_intro.c -libhttp_a_CFLAGS = -Wall -I ../../include/ +libhttp_a_CFLAGS = $(CFLAGS) -Wall -I ../../include/ diff --git a/src/logger/Makefile.am b/src/logger/Makefile.am index 261a0b9..461499f 100644 --- a/src/logger/Makefile.am +++ b/src/logger/Makefile.am @@ -3,4 +3,4 @@ ACLOCAL_AMFLAGS = -I m4 noinst_LIBRARIES = liblogger.a liblogger_a_SOURCES = interface/i_logger.c logger.c stderr.c syslog.c -liblogger_a_CFLAGS = -Wall -I ../../include/ +liblogger_a_CFLAGS = $(CFLAGS) -Wall -I ../../include/ diff --git a/src/queue/Makefile.am b/src/queue/Makefile.am index 8a2196a..6fb286c 100644 --- a/src/queue/Makefile.am +++ b/src/queue/Makefile.am @@ -3,4 +3,4 @@ ACLOCAL_AMFLAGS = -I m4 noinst_LIBRARIES = libqueue.a libqueue_a_SOURCES = queue.c get.c put.c -libqueue_a_CFLAGS = -Wall -I ../../include/ +libqueue_a_CFLAGS = $(CFLAGS) -Wall -I ../../include/ diff --git a/src/server/Makefile.am b/src/server/Makefile.am index a73bb16..4126672 100644 --- a/src/server/Makefile.am +++ b/src/server/Makefile.am @@ -6,4 +6,4 @@ SERVER = server.c run.c close_conn.c poll.c \ noinst_LIBRARIES = libserver.a libserver_a_SOURCES = $(SERVER) -libserver_a_CFLAGS = -Wall -I ../../include/ +libserver_a_CFLAGS = $(CFLAGS) -Wall -I ../../include/ diff --git a/src/session/Makefile.am b/src/session/Makefile.am index 7b6d884..2892b01 100644 --- a/src/session/Makefile.am +++ b/src/session/Makefile.am @@ -3,4 +3,4 @@ ACLOCAL_AMFLAGS = -I m4 noinst_LIBRARIES = libsession.a libsession_a_SOURCES = session.c add.c get.c delete.c -libsession_a_CFLAGS = -Wall -I ../../include/ +libsession_a_CFLAGS = $(CFLAGS) -Wall -I ../../include/ diff --git a/src/socket/Makefile.am b/src/socket/Makefile.am index 89ef4f0..b59bbc7 100644 --- a/src/socket/Makefile.am +++ b/src/socket/Makefile.am @@ -3,4 +3,4 @@ ACLOCAL_AMFLAGS = -I m4 noinst_LIBRARIES = libsocket.a libsocket_a_SOURCES = socket.c accept.c connect.c listen.c -libsocket_a_CFLAGS = -Wall -I ../../include/ +libsocket_a_CFLAGS = $(CFLAGS) -Wall -I ../../include/ diff --git a/src/stream/Makefile.am b/src/stream/Makefile.am index bf8134e..073f18e 100644 --- a/src/stream/Makefile.am +++ b/src/stream/Makefile.am @@ -7,4 +7,4 @@ IFACE = interface/reader.c \ noinst_LIBRARIES = libstream.a libstream_a_SOURCES = $(STREAM) $(IFACE) -libstream_a_CFLAGS = -Wall -I ../../include/ +libstream_a_CFLAGS = $(CFLAGS) -Wall -I ../../include/