From bf40ec1d5d251e284ebedf1a630d126cf4f11863 Mon Sep 17 00:00:00 2001 From: Stefan Gehn Date: Sat, 12 Jun 2010 14:10:52 +0000 Subject: [PATCH] Allow passing linker flags via LDFLAGS in Makefile --- server/Makefile | 5 +++-- src/Makefile | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/server/Makefile b/server/Makefile index 240b01d..1e997fa 100644 --- a/server/Makefile +++ b/server/Makefile @@ -115,11 +115,12 @@ OBJS = main.o monitor.o mail.o plugins.o glib.o utils.o sysdeps-unix.o log.o all: gkrellmd gkrellmd: $(OBJS) $(EXTRAOBJS) - $(CC) $(OBJS) $(EXTRAOBJS) -o gkrellmd $(LIBS) $(LINK_FLAGS) + $(CC) $(OBJS) $(EXTRAOBJS) -o gkrellmd \ + $(LDFLAGS) $(LIBS) $(LINK_FLAGS) static: $(OBJS) $(EXTRAOBJS) $(CC) $(OBJS) $(EXTRAOBJS) -o gkrellmd.static -static \ - $(LIBS) $(LINK_FLAGS) + $(LDFLAGS) $(LIBS) $(LINK_FLAGS) freebsd2: $(MAKE) GTK_CONFIG=gtk12-config \ diff --git a/src/Makefile b/src/Makefile index beb81e2..4047564 100644 --- a/src/Makefile +++ b/src/Makefile @@ -115,11 +115,12 @@ UNIXOBJS = winops-x11.o all: gkrellm gkrellm: check_env $(OBJS) $(UNIXOBJS) $(EXTRAOBJS) - $(CC) $(OBJS) $(UNIXOBJS) $(EXTRAOBJS) -o gkrellm $(LIBS) $(LINK_FLAGS) + $(CC) $(OBJS) $(UNIXOBJS) $(EXTRAOBJS) -o gkrellm \ + $(LDFLAGS) $(LIBS) $(LINK_FLAGS) static: check_env $(OBJS) $(UNIXOBJS) $(EXTRAOBJS) $(CC) $(OBJS) $(UNIXOBJS) $(EXTRAOBJS) -o gkrellm.static -static \ - $(LIBS) $(LINK_FLAGS) + $(LDFLAGS) $(LIBS) $(LINK_FLAGS) freebsd2: ifeq ($(HAVE_SSL),1)