diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-01-10 22:35:08 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2006-01-10 22:35:08 +0100 |
| commit | 8e419cb4f86679636b2d96618e1bec4853636c11 (patch) | |
| tree | b7514f0bd06ce2a1f5290c53552c692698091d2b /protocols/oscar | |
| parent | 3e91c3ec7d6426c4c2819e78275f935e1a7fce2c (diff) | |
| parent | dd8d4c5243eea91dd3b0709ae76abdd3743e99bc (diff) | |
Merge Wilmer
Diffstat (limited to 'protocols/oscar')
| -rw-r--r-- | protocols/oscar/Makefile | 8 | ||||
| -rw-r--r-- | protocols/oscar/oscar.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/protocols/oscar/Makefile b/protocols/oscar/Makefile index 5ef996a1..97a27299 100644 --- a/protocols/oscar/Makefile +++ b/protocols/oscar/Makefile @@ -15,7 +15,7 @@ CFLAGS += -Wall LFLAGS += -r # [SH] Phony targets -all: oscarr.o +all: oscar_mod.o .PHONY: all clean distclean @@ -32,6 +32,6 @@ $(objects): %.o: %.c @echo '*' Compiling $< @$(CC) -c $(CFLAGS) $< -o $@ -oscarr.o: $(objects) - @echo '*' Linking oscarr.o - @$(LD) $(LFLAGS) $(objects) -o oscarr.o +oscar_mod.o: $(objects) + @echo '*' Linking oscar_mod.o + @$(LD) $(LFLAGS) $(objects) -o oscar_mod.o diff --git a/protocols/oscar/oscar.c b/protocols/oscar/oscar.c index 5f19f12b..b4bfb220 100644 --- a/protocols/oscar/oscar.c +++ b/protocols/oscar/oscar.c @@ -20,7 +20,6 @@ * */ -#include "sock.h" #include <errno.h> #include <ctype.h> #include <string.h> @@ -32,6 +31,7 @@ #include "nogaim.h" #include "bitlbee.h" #include "proxy.h" +#include "sock.h" #include "aim.h" #include "icq.h" |