diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-03-08 13:24:26 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-03-08 13:24:26 +0100 |
| commit | f2b154b7d74e21b7e655c6cd121155592c1bee03 (patch) | |
| tree | d1d8f06abeb89834cebb70d33229aff129b9d485 /package/bitlbee/patches/patch-protocols_jabber_Makefile | |
| parent | c93c25a63b3b5a29a258460519ed36341da2e79e (diff) | |
| parent | 63e65ec30b763d6687d462c52cb46bd5e738928a (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/bitlbee/patches/patch-protocols_jabber_Makefile')
| -rw-r--r-- | package/bitlbee/patches/patch-protocols_jabber_Makefile | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/package/bitlbee/patches/patch-protocols_jabber_Makefile b/package/bitlbee/patches/patch-protocols_jabber_Makefile index b1dc63a0e..0e227dcca 100644 --- a/package/bitlbee/patches/patch-protocols_jabber_Makefile +++ b/package/bitlbee/patches/patch-protocols_jabber_Makefile @@ -1,17 +1,24 @@ ---- bitlbee-1.2.4.orig/protocols/jabber/Makefile 2009-10-17 17:26:46.000000000 +0200 -+++ bitlbee-1.2.4/protocols/jabber/Makefile 2010-03-07 20:00:36.426039459 +0100 -@@ -12,7 +12,7 @@ - objects = conference.o io.o iq.o jabber.o jabber_util.o message.o presence.o sasl.o +--- bitlbee-3.0.1.orig/protocols/jabber/Makefile 2010-11-24 23:44:00.000000000 +0100 ++++ bitlbee-3.0.1/protocols/jabber/Makefile 2011-03-03 22:41:38.000000000 +0100 +@@ -14,7 +14,7 @@ endif + # [SH] Program variables + objects = conference.o io.o iq.o jabber.o jabber_util.o message.o presence.o s5bytestream.o sasl.o si.o - CFLAGS += -Wall -LFLAGS += -r +LFLAGS += -Wl,-r -nostdlib # [SH] Phony targets all: jabber_mod.o -@@ -38,4 +38,4 @@ $(objects): %.o: %.c +@@ -37,10 +37,10 @@ $(objects): ../../Makefile.settings Make + + $(objects): %.o: $(SRCDIR)%.c + @echo '*' Compiling $< +- @$(CC) -c $(CFLAGS) $< -o $@ ++ $(CC) -c $(CFLAGS) $< -o $@ jabber_mod.o: $(objects) @echo '*' Linking jabber_mod.o - @$(LD) $(LFLAGS) $(objects) -o jabber_mod.o -+ @$(CC) $(LFLAGS) $(objects) -o jabber_mod.o ++ $(CC) $(LFLAGS) $(objects) -o jabber_mod.o + + -include .depend/*.d |