Showing
2 changed files
with
8 additions
and
4 deletions
| @@ -8,7 +8,7 @@ AC_INIT([taskrambler], | @@ -8,7 +8,7 @@ AC_INIT([taskrambler], | ||
| 8 | LT_INIT | 8 | LT_INIT |
| 9 | AM_INIT_AUTOMAKE | 9 | AM_INIT_AUTOMAKE |
| 10 | #AM_INIT_AUTOMAKE([subdir-objects]) | 10 | #AM_INIT_AUTOMAKE([subdir-objects]) |
| 11 | -AM_SILENT_RULES([yes]) | 11 | +AM_SILENT_RULES([no]) |
| 12 | AC_COPYRIGHT([Copyright © 2013 Georg Hopp]) | 12 | AC_COPYRIGHT([Copyright © 2013 Georg Hopp]) |
| 13 | AC_REVISION([m4_esyscmd_s([git describe --always])]) | 13 | AC_REVISION([m4_esyscmd_s([git describe --always])]) |
| 14 | AC_CONFIG_SRCDIR([src/taskrambler.c]) | 14 | AC_CONFIG_SRCDIR([src/taskrambler.c]) |
| @@ -19,7 +19,8 @@ TR = ./application/.libs/libapplication.a \ | @@ -19,7 +19,8 @@ TR = ./application/.libs/libapplication.a \ | ||
| 19 | ./config/.libs/libconfig.a \ | 19 | ./config/.libs/libconfig.a \ |
| 20 | ./router/.libs/librouter.a | 20 | ./router/.libs/librouter.a |
| 21 | 21 | ||
| 22 | -TRLIBS = -ltrbase -ltrhash -ltrio -ltrdata -ltrutils -ltrhttpserver | 22 | +TRFLIBS = -ltrbase -ltrhash -ltrio -ltrdata |
| 23 | +TRLIBS = $(TRFLIBS) -ltrutils -ltrhttpserver | ||
| 23 | USEDLIBS = -lrt -lssl -lcrypto -lldap -lgdbm -luuid | 24 | USEDLIBS = -lrt -lssl -lcrypto -lldap -lgdbm -luuid |
| 24 | 25 | ||
| 25 | AM_CFLAGS += -I../include/ | 26 | AM_CFLAGS += -I../include/ |
| @@ -33,13 +34,16 @@ libtrutils_la_LIBADD = | @@ -33,13 +34,16 @@ libtrutils_la_LIBADD = | ||
| 33 | 34 | ||
| 34 | libtrhttpserver_la_SOURCES = | 35 | libtrhttpserver_la_SOURCES = |
| 35 | libtrhttpserver_la_CFLAGS = $(AM_CFLAGS) | 36 | libtrhttpserver_la_CFLAGS = $(AM_CFLAGS) |
| 36 | -libtrhttpserver_la_LIBADD = $(TRHTTPSERVER) | 37 | +libtrhttpserver_la_LIBADD = $(TRHTTPSERVER) $(TRFLIBS) |
| 37 | 38 | ||
| 38 | taskrambler_SOURCES = taskrambler.c $(IFACE) $(UTILS) | 39 | taskrambler_SOURCES = taskrambler.c $(IFACE) $(UTILS) |
| 39 | taskrambler_CFLAGS = $(AM_CFLAGS) | 40 | taskrambler_CFLAGS = $(AM_CFLAGS) |
| 40 | taskrambler_LDADD = $(TRLIBS) $(TR) $(USEDLIBS) | 41 | taskrambler_LDADD = $(TRLIBS) $(TR) $(USEDLIBS) |
| 41 | taskrambler_LDFLAGS = -Wl,--export-dynamic \ | 42 | taskrambler_LDFLAGS = -Wl,--export-dynamic \ |
| 42 | - -Wl,--whole-archive,./application/.libs/libapplication.a,--no-whole-archive | 43 | + -Wl,--whole-archive \ |
| 44 | + -Wl,./application/.libs/libapplication.a \ | ||
| 45 | + -Wl,--no-whole-archive \ | ||
| 46 | + -Wl,--as-needed | ||
| 43 | 47 | ||
| 44 | SUBDIRS = asset auth http \ | 48 | SUBDIRS = asset auth http \ |
| 45 | server session application \ | 49 | server session application \ |
Please
register
or
login
to post a comment