Commit 8710078a03eae9864b4455c98001f6842c133243

Authored by Georg Hopp
1 parent 748b2b3f

build shared libraries from the parts that might be useful on their on and let taskrambler use them

1 1 .*.swp
2 2 *.o
3 3 *.a
  4 +*.lo
  5 +*.la
4 6 *.gcda
5 7 *.gcno
6 8 .dirstamp
7 9 .deps/
  10 +.libs/
8 11 Makefile
9 12 configure
10 13 Makefile.in
... ... @@ -34,4 +37,4 @@ src/taskrambler
34 37 /tests/*.trs
35 38 gmon.out
36 39 test-driver
37   -
  40 +/assets/html/_documentation.html
... ...
... ... @@ -8,7 +8,7 @@ AC_INIT([taskrambler],
8 8 LT_INIT
9 9 AM_INIT_AUTOMAKE
10 10 #AM_INIT_AUTOMAKE([subdir-objects])
11   -AM_SILENT_RULES([yes])
  11 +#AM_SILENT_RULES([yes])
12 12 AC_COPYRIGHT([Copyright © 2013 Georg Hopp])
13 13 AC_REVISION([m4_esyscmd_s([git describe --always])])
14 14 AC_CONFIG_SRCDIR([src/taskrambler.c])
... ... @@ -66,10 +66,12 @@ myetcdir=${sysconfdir}/taskrambler
66 66 varlibdir=${localstatedir}/lib/taskrambler
67 67 varrundir=${localstatedir}/run/taskrambler
68 68 trdatadir=${datadir}/taskrambler
  69 +trlibdir=${libdir}/taskrambler
69 70 AC_SUBST(myetcdir)
70 71 AC_SUBST(varlibdir)
71 72 AC_SUBST(varrundir)
72 73 AC_SUBST(trdatadir)
  74 +AC_SUBST(trlibdir)
73 75
74 76 AM_CFLAGS="${AM_CFLAGS} ${DRAGONEGG_FLAGS}"
75 77 AM_CFLAGS="${AM_CFLAGS} ${MEM_OPT_FLAGS}"
... ...
1 1 ACLOCAL_AMFLAGS = -I m4
2 2 AUTOMAKE_OPTIONS = subdir-objects
3 3
4   -IFACE = interface/subject.c \
5   - interface/observer.c
6   -
7   -UTILS = utils/hash.c \
8   - utils/memory.c \
9   - utils/http.c \
10   - utils/daemonize.c \
11   - utils/signalHandling.c \
12   - utils/mime_type.c
13   -
14   -LIBS = ./application/libapplication.a \
15   - ./user/libuser.a \
16   - ./storage/libstorage.a \
17   - ./http/libhttp.a \
18   - ./auth/libauth.a \
19   - ./cbuf/libcbuf.a \
20   - ./class/libclass.a \
21   - ./asset/libasset.a \
22   - ./hash/libhash.a \
23   - ./queue/libqueue.a \
24   - ./logger/liblogger.a \
25   - ./server/libserver.a \
26   - ./session/libsession.a \
27   - ./socket/libsocket.a \
28   - ./stream/libstream.a \
29   - ./tree/libtree.a \
30   - ./config/libconfig.a
  4 +
  5 +TRUTILS = utils/hash.c \
  6 + utils/memory.c \
  7 + utils/http.c \
  8 + utils/daemonize.c \
  9 + utils/signalHandling.c \
  10 + utils/mime_type.c
  11 +
  12 +TRBASESRC = interface/subject.c \
  13 + interface/observer.c
  14 +
  15 +TRBASELIBS = class/libclass.la \
  16 + cbuf/libcbuf.la \
  17 + hash/libhash.la \
  18 + queue/libqueue.la \
  19 + logger/liblogger.la \
  20 + tree/libtree.la \
  21 + stream/libstream.la
  22 +
  23 +TRHTTPSERVER = http/libhttp.la \
  24 + asset/libasset.la \
  25 + server/libserver.la \
  26 + socket/libsocket.la
  27 +
  28 +TR = ./application/.libs/libapplication.a \
  29 + ./user/.libs/libuser.a \
  30 + ./storage/.libs/libstorage.a \
  31 + ./auth/.libs/libauth.a \
  32 + ./session/.libs/libsession.a \
  33 + ./config/.libs/libconfig.a
  34 +
  35 +TRLIBS = -ltrutils -ltrhttpserver -ltrbase
  36 +USEDLIBS = -lrt -lssl -lldap -lgdbm -luuid
31 37
32 38 AM_CFLAGS += -I../include/
33 39
34 40 bin_PROGRAMS = taskrambler
  41 +lib_LTLIBRARIES = libtrutils.la libtrbase.la libtrhttpserver.la
  42 +
  43 +libtrutils_la_SOURCES = $(TRUTILS)
  44 +libtrutils_la_CFLAGS = $(AM_CFLAGS)
  45 +libtrutils_la_LIBADD =
  46 +
  47 +libtrbase_la_SOURCES = $(TRBASESRC)
  48 +libtrbase_la_CFLAGS = $(AM_CFLAGS)
  49 +libtrbase_la_LIBADD = $(TRBASELIBS)
  50 +
  51 +libtrhttpserver_la_SOURCES =
  52 +libtrhttpserver_la_CFLAGS = $(AM_CFLAGS)
  53 +libtrhttpserver_la_LIBADD = $(TRHTTPSERVER)
35 54
36 55 taskrambler_SOURCES = taskrambler.c $(IFACE) $(UTILS)
37 56 taskrambler_CFLAGS = $(AM_CFLAGS)
38   -taskrambler_LDADD = $(LIBS) -lrt -lssl -lldap -lgdbm -luuid
39   -#taskrambler_LDFLAGS = $(COVERAGE_LDFLAGS)
  57 +taskrambler_LDADD = $(TRLIBS) $(USEDLIBS) $(TR)
40 58
41 59 SUBDIRS = asset auth cbuf class hash queue http \
42 60 logger server session socket stream tree application \
... ...
... ... @@ -14,7 +14,7 @@ ADAPTERHTTP = adapter/http/http.c \
14 14
15 15 AM_CFLAGS += -I../../include/
16 16
17   -noinst_LIBRARIES = libapplication.a
  17 +noinst_LTLIBRARIES = libapplication.la
18 18
19   -libapplication_a_SOURCES = $(APPLICATION) $(ADAPTERHTTP)
20   -libapplication_a_CFLAGS = $(AM_CFLAGS)
  19 +libapplication_la_SOURCES = $(APPLICATION) $(ADAPTERHTTP)
  20 +libapplication_la_CFLAGS = $(AM_CFLAGS)
... ...
... ... @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = subdir-objects
3 3
4 4 AM_CFLAGS += -I../../include/
5 5
6   -noinst_LIBRARIES = libasset.a
  6 +noinst_LTLIBRARIES = libasset.la
7 7
8   -libasset_a_SOURCES = asset.c pool.c
9   -libasset_a_CFLAGS = $(AM_CFLAGS)
  8 +libasset_la_SOURCES = asset.c pool.c
  9 +libasset_la_CFLAGS = $(AM_CFLAGS)
... ...
1 1 ACLOCAL_AMFLAGS = -I m4
2 2 AUTOMAKE_OPTIONS = subdir-objects
3 3
  4 +AUTH = interface/auth.c \
  5 + credential.c \
  6 + ldap.c \
  7 + storage/storage.c \
  8 + storage/hash_pw.c
  9 +
4 10 AM_CFLAGS += -I../../include/
5 11
6   -noinst_LIBRARIES = libauth.a
  12 +noinst_LTLIBRARIES = libauth.la
7 13
8   -libauth_a_SOURCES = interface/auth.c \
9   - credential.c \
10   - ldap.c \
11   - storage/storage.c \
12   - storage/hash_pw.c
13   -libauth_a_CFLAGS = $(AM_CFLAGS)
  14 +libauth_la_SOURCES = $(AUTH)
  15 +libauth_la_CFLAGS = $(AM_CFLAGS)
... ...
... ... @@ -10,7 +10,7 @@ CB = cbuf.c read.c \
10 10
11 11 AM_CFLAGS += -I../../include/
12 12
13   -noinst_LIBRARIES = libcbuf.a
  13 +noinst_LTLIBRARIES = libcbuf.la
14 14
15   -libcbuf_a_SOURCES = $(CB)
16   -libcbuf_a_CFLAGS = $(AM_CFLAGS)
  15 +libcbuf_la_SOURCES = $(CB)
  16 +libcbuf_la_CFLAGS = $(AM_CFLAGS)
... ...
... ... @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = subdir-objects
3 3
4 4 AM_CFLAGS += -I../../include/
5 5
6   -noinst_LIBRARIES = libclass.a
  6 +noinst_LTLIBRARIES = libclass.la
7 7
8   -libclass_a_SOURCES = interface.c interface/i_class.c
9   -libclass_a_CFLAGS = $(AM_CFLAGS)
  8 +libclass_la_SOURCES = interface.c interface/i_class.c
  9 +libclass_la_CFLAGS = $(AM_CFLAGS)
... ...
... ... @@ -5,7 +5,7 @@ CONFIG = config.c value.c get.c
5 5
6 6 AM_CFLAGS += -I../../include/
7 7
8   -noinst_LIBRARIES = libconfig.a
  8 +noinst_LTLIBRARIES = libconfig.la
9 9
10   -libconfig_a_SOURCES = $(CONFIG)
11   -libconfig_a_CFLAGS = $(AM_CFLAGS)
  10 +libconfig_la_SOURCES = $(CONFIG)
  11 +libconfig_la_CFLAGS = $(AM_CFLAGS)
... ...
... ... @@ -6,7 +6,7 @@ HASH = hash.c add.c get.c get_first.c delete.c each.c value.c \
6 6
7 7 AM_CFLAGS += -I../../include/
8 8
9   -noinst_LIBRARIES = libhash.a
  9 +noinst_LTLIBRARIES = libhash.la
10 10
11   -libhash_a_SOURCES = $(HASH)
12   -libhash_a_CFLAGS = $(AM_CFLAGS)
  11 +libhash_la_SOURCES = $(HASH)
  12 +libhash_la_CFLAGS = $(AM_CFLAGS)
... ...
... ... @@ -36,8 +36,8 @@ HEADER = header.c \
36 36
37 37 AM_CFLAGS += -I../../include/
38 38
39   -noinst_LIBRARIES = libhttp.a
  39 +noinst_LTLIBRARIES = libhttp.la
40 40
41   -libhttp_a_SOURCES = $(MSG) $(REQ) $(RESP) $(PARSER) $(WRITER) \
  41 +libhttp_la_SOURCES = $(MSG) $(REQ) $(RESP) $(PARSER) $(WRITER) \
42 42 $(WORKER) $(HEADER) interface/i_http_intro.c
43   -libhttp_a_CFLAGS = $(AM_CFLAGS)
  43 +libhttp_la_CFLAGS = $(AM_CFLAGS)
... ...
... ... @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = subdir-objects
3 3
4 4 AM_CFLAGS += -I../../include/
5 5
6   -noinst_LIBRARIES = liblogger.a
  6 +noinst_LTLIBRARIES = liblogger.la
7 7
8   -liblogger_a_SOURCES = interface/i_logger.c logger.c stderr.c syslog.c
9   -liblogger_a_CFLAGS = $(AM_CFLAGS)
  8 +liblogger_la_SOURCES = interface/i_logger.c logger.c stderr.c syslog.c
  9 +liblogger_la_CFLAGS = $(AM_CFLAGS)
... ...
... ... @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = subdir-objects
3 3
4 4 AM_CFLAGS += -I../../include/
5 5
6   -noinst_LIBRARIES = libqueue.a
  6 +noinst_LTLIBRARIES = libqueue.la
7 7
8   -libqueue_a_SOURCES = queue.c get.c put.c
9   -libqueue_a_CFLAGS = $(AM_CFLAGS)
  8 +libqueue_la_SOURCES = queue.c get.c put.c
  9 +libqueue_la_CFLAGS = $(AM_CFLAGS)
... ...
... ... @@ -6,7 +6,7 @@ SERVER = server.c run.c close_conn.c poll.c \
6 6
7 7 AM_CFLAGS += -I../../include/
8 8
9   -noinst_LIBRARIES = libserver.a
  9 +noinst_LTLIBRARIES = libserver.la
10 10
11   -libserver_a_SOURCES = $(SERVER)
12   -libserver_a_CFLAGS = $(AM_CFLAGS)
  11 +libserver_la_SOURCES = $(SERVER)
  12 +libserver_la_CFLAGS = $(AM_CFLAGS)
... ...
... ... @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = subdir-objects
3 3
4 4 AM_CFLAGS += -I../../include/
5 5
6   -noinst_LIBRARIES = libsession.a
  6 +noinst_LTLIBRARIES = libsession.la
7 7
8   -libsession_a_SOURCES = session.c
9   -libsession_a_CFLAGS = $(AM_CFLAGS)
  8 +libsession_la_SOURCES = session.c
  9 +libsession_la_CFLAGS = $(AM_CFLAGS)
... ...
... ... @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = subdir-objects
3 3
4 4 AM_CFLAGS += -I../../include/
5 5
6   -noinst_LIBRARIES = libsocket.a
  6 +noinst_LTLIBRARIES = libsocket.la
7 7
8   -libsocket_a_SOURCES = socket.c accept.c connect.c listen.c nonblock.c
9   -libsocket_a_CFLAGS = $(AM_CFLAGS)
  8 +libsocket_la_SOURCES = socket.c accept.c connect.c listen.c nonblock.c
  9 +libsocket_la_CFLAGS = $(AM_CFLAGS)
... ...
... ... @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = subdir-objects
3 3
4 4 AM_CFLAGS += -I../../include/
5 5
6   -noinst_LIBRARIES = libstorage.a
  6 +noinst_LTLIBRARIES = libstorage.la
7 7
8   -libstorage_a_SOURCES = storage.c get.c put.c update.c
9   -libstorage_a_CFLAGS = $(AM_CFLAGS)
  8 +libstorage_la_SOURCES = storage.c get.c put.c update.c
  9 +libstorage_la_CFLAGS = $(AM_CFLAGS)
... ...
... ... @@ -7,7 +7,7 @@ IFACE = interface/reader.c \
7 7
8 8 AM_CFLAGS += -I../../include/
9 9
10   -noinst_LIBRARIES = libstream.a
  10 +noinst_LTLIBRARIES = libstream.la
11 11
12   -libstream_a_SOURCES = $(STREAM) $(IFACE)
13   -libstream_a_CFLAGS = $(AM_CFLAGS)
  12 +libstream_la_SOURCES = $(STREAM) $(IFACE)
  13 +libstream_la_CFLAGS = $(AM_CFLAGS)
... ...
... ... @@ -6,7 +6,7 @@ TREE = tree.c find.c insert.c inOrderSuccessor.c delete.c walk.c \
6 6
7 7 AM_CFLAGS += -I../../include/
8 8
9   -noinst_LIBRARIES = libtree.a
  9 +noinst_LTLIBRARIES = libtree.la
10 10
11   -libtree_a_SOURCES = $(TREE)
12   -libtree_a_CFLAGS = $(AM_CFLAGS)
  11 +libtree_la_SOURCES = $(TREE)
  12 +libtree_la_CFLAGS = $(AM_CFLAGS)
... ...
... ... @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = subdir-objects
3 3
4 4 AM_CFLAGS += -I../../include/
5 5
6   -noinst_LIBRARIES = libuser.a
  6 +noinst_LTLIBRARIES = libuser.la
7 7
8   -libuser_a_SOURCES = user.c load.c save.c
9   -libuser_a_CFLAGS = $(AM_CFLAGS)
  8 +libuser_la_SOURCES = user.c load.c save.c
  9 +libuser_la_CFLAGS = $(AM_CFLAGS)
... ...
Please register or login to post a comment