aboutsummaryrefslogtreecommitdiffstats
path: root/protocols/Makefile
diff options
context:
space:
mode:
authorWilmer van der Gaast <wilmer@gaast.net>2010-06-06 00:21:02 +0100
committerWilmer van der Gaast <wilmer@gaast.net>2010-06-06 00:21:02 +0100
commitb308cf9bafbdf76da73a57607b65c4763aa3057b (patch)
treec686906b479a0edd52b18a213e1d420f7343855d /protocols/Makefile
parent3ab1d317831a6c1830bb648a1a8d63a41c92f651 (diff)
parente774815bc621af90bb64ca314b84367659c5a005 (diff)
Merging libpurple branch into killerbee. It's fairly usable already, and
Debian packaging is now properly separated. This also picks up a load of stuff from mainline it seems.
Diffstat (limited to 'protocols/Makefile')
-rw-r--r--protocols/Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/protocols/Makefile b/protocols/Makefile
index 18d79e8d..57fcd7eb 100644
--- a/protocols/Makefile
+++ b/protocols/Makefile
@@ -7,6 +7,9 @@
### DEFINITIONS
-include ../Makefile.settings
+ifdef SRCDIR
+SRCDIR := $(SRCDIR)protocols/
+endif
# [SH] Program variables
objects = nogaim.o
@@ -48,6 +51,6 @@ protocols.o: $(objects) $(subdirs)
$(objects): ../Makefile.settings Makefile
-$(objects): %.o: %.c
+$(objects): %.o: $(SRCDIR)%.c
@echo '*' Compiling $<
@$(CC) -c $(CFLAGS) $< -o $@