summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMatthew Johnson <mjj29@hecate.trinhall.cam.ac.uk>2006-11-12 11:29:07 +0000
committerMatthew Johnson <mjj29@hecate.trinhall.cam.ac.uk>2006-11-12 11:29:07 +0000
commit87692b8970bd653ee7265350d39d089a1a0e98b1 (patch)
tree3d9f98173d5aad09fef083aba77d7ab4c4887574 /Makefile
parent2df3ab8f0e41932050e95118b3a75d4c8c3044a6 (diff)
LDFLAGS change from TFKyle
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 9b4a320..9001d11 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ INCLUDES?=`pkg-config --cflags dbus-1` -I${JAVA_HOME}/include -I${JAVA_HOME}/inc
CFLAGS?= -Os -Wall -Werror
CFLAGS+=$(INCLUDES)
CFLAGS+=$(call cc-option,-fno-stack-protector,)
-LDFLAGS?=`pkg-config --libs dbus-1`
+LIBS?=`pkg-config --libs dbus-1`
CC?=gcc
LD?=ld
STRIP?=strip
@@ -84,7 +84,7 @@ dbus-java.o: dbus-java.c org_freedesktop_dbus_DBusConnection.h org_freedesktop_d
$(CC) $(CFLAGS) -fpic -c $< -o $@
libdbus-java.so: dbus-java.o
- $(LD) $(LDFLAGS) -fpic -shared -o $@ $^
+ $(LD) $(LDFLAGS) -fpic -shared -o $@ $^ $(LIBS)
$(STRIP) $@
libdbus-java-$(VERSION).jar: .classes
(cd classes; $(JAR) -cf ../$@ org/freedesktop/dbus/*.class org/freedesktop/*.class org/freedesktop/Hal/*.class)