src/Makefile | 4 ++-- wdmd/Makefile | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-)
New commits: commit d37b199b389bb92c7c96889a22107965413a829f Author: David Weber wb@munzinger.de Date: Mon Jan 9 09:33:23 2012 -0600
Fix order of linking
Fixes build on Ubuntu 11.10
diff --git a/src/Makefile b/src/Makefile index 8ab63d4..f7cf6cd 100644 --- a/src/Makefile +++ b/src/Makefile @@ -72,8 +72,8 @@ CFLAGS += -D_GNU_SOURCE -g \
CMD_CFLAGS = $(CFLAGS) -fPIE -DPIE
-CMD_LDFLAGS += -lpthread -luuid -lrt -laio -lblkid -lsanlock -L../wdmd -lwdmd CMD_LDFLAGS += -Wl,-z,now -Wl,-z,relro -pie +CMD_LDADD += -lpthread -luuid -lrt -laio -lblkid -lsanlock -L../wdmd -lwdmd
LIB_ENTIRE_LDFLAGS += -lpthread -lrt -laio -lblkid -L../wdmd -lwdmd LIB_ENTIRE_LDFLAGS += -Wl,-z,relro -pie @@ -94,7 +94,7 @@ $(LIBSO_CLIENT_TARGET): $(LIB_CLIENT_SOURCE) ln -sf $(LIBSO_CLIENT_TARGET) $(LIB_CLIENT_TARGET).so.$(SOMAJOR)
$(CMD_TARGET): $(LIBSO_ENTIRE_TARGET) $(CMD_SOURCE) - $(CC) $(CMD_CFLAGS) $(CMD_LDFLAGS) $(CMD_SOURCE) -o $@ -L. + $(CC) $(CMD_CFLAGS) $(CMD_LDFLAGS) $(CMD_SOURCE) $(CMD_LDADD) -o $@ -L.
clean: rm -f *.o *.so *.so.* $(CMD_TARGET) diff --git a/wdmd/Makefile b/wdmd/Makefile index 8adaf1a..783d1fd 100644 --- a/wdmd/Makefile +++ b/wdmd/Makefile @@ -42,8 +42,8 @@ CFLAGS += -D_GNU_SOURCE -g \ -fdiagnostics-show-option \ -fPIE -DPIE
-CMD_LDFLAGS += -lwdmd -lrt CMD_LDFLAGS += -Wl,-z,now -Wl,-z,relro -pie +CMD_LDADD += -lwdmd -lrt
LIB_LDFLAGS += -Wl,-z,relro -pie
@@ -58,10 +58,10 @@ $(SHLIB_TARGET): $(LIB_SOURCE) ln -sf $(SHLIB_TARGET) $(LIB_TARGET).so.$(SOMAJOR)
$(CMD_TARGET): $(SHLIB_TARGET) $(CMD_SOURCE) - $(CC) $(CFLAGS) $(CMD_LDFLAGS) $(CMD_SOURCE) -o $@ -L. + $(CC) $(CFLAGS) $(CMD_LDFLAGS) $(CMD_SOURCE) $(CMD_LDADD) -o $@ -L.
$(TEST_TARGET): $(SHLIB_TARGET) $(TEST_SOURCE) - $(CC) $(CFLAGS) $(TEST_LDFLAGS) $(TEST_SOURCE) -o $@ -L. + $(CC) $(CFLAGS) $(TEST_LDFLAGS) $(TEST_SOURCE) $(CMD_LDADD) -o $@ -L.
clean: rm -f *.o *.so *.so.* $(CMD_TARGET) $(TEST_TARGET)