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_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_Makefile')
| -rw-r--r-- | package/bitlbee/patches/patch-protocols_Makefile | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/package/bitlbee/patches/patch-protocols_Makefile b/package/bitlbee/patches/patch-protocols_Makefile index ffb47b391..2608b77b0 100644 --- a/package/bitlbee/patches/patch-protocols_Makefile +++ b/package/bitlbee/patches/patch-protocols_Makefile @@ -1,20 +1,26 @@ ---- bitlbee-1.2.4.orig/protocols/Makefile 2009-10-17 17:26:46.000000000 +0200 -+++ bitlbee-1.2.4/protocols/Makefile 2010-03-07 20:02:06.789785295 +0100 -@@ -21,7 +21,7 @@ subdirobjs = $(PROTOOBJS) +--- bitlbee-3.0.1.orig/protocols/Makefile 2010-11-24 23:44:00.000000000 +0100 ++++ bitlbee-3.0.1/protocols/Makefile 2011-03-03 22:43:33.000000000 +0100 +@@ -24,7 +24,7 @@ subdirobjs = $(PROTOOBJS) + # Expansion of variables subdirobjs := $(join $(subdirs),$(addprefix /,$(subdirobjs))) - CFLAGS += -Wall -LFLAGS += -r +LFLAGS += -Wl,-r -nostdlib # [SH] Phony targets all: protocols.o -@@ -44,7 +44,7 @@ $(subdirs): +@@ -48,12 +48,12 @@ $(subdirs): protocols.o: $(objects) $(subdirs) @echo '*' Linking protocols.o - @$(LD) $(LFLAGS) $(objects) $(subdirobjs) -o protocols.o -+ @$(CC) $(LFLAGS) $(objects) $(subdirobjs) -o protocols.o ++ $(CC) $(LFLAGS) $(objects) $(subdirobjs) -o protocols.o $(objects): ../Makefile.settings Makefile + $(objects): %.o: $(SRCDIR)%.c + @echo '*' Compiling $< +- @$(CC) -c $(CFLAGS) $< -o $@ ++ $(CC) -c $(CFLAGS) $< -o $@ + + -include .depend/*.d |