]>
Commit | Line | Data |
---|---|---|
236898d6 MT |
1 | diff -up net-tools-1.60/lib/Makefile.makefile-berlios net-tools-1.60/lib/Makefile |
2 | --- net-tools-1.60/lib/Makefile.makefile-berlios 2009-09-15 18:07:12.000000000 +0200 | |
3 | +++ net-tools-1.60/lib/Makefile 2009-09-15 18:07:12.000000000 +0200 | |
4 | @@ -36,7 +36,7 @@ OBJS = $(sort $(VARIA) $(AFOBJS) $(HWOBJ | |
5 | ||
6 | # This can be overwritten by the TOPLEVEL Makefile | |
7 | TOPDIR=.. | |
8 | -CFLAGS += -I$(TOPDIR) -idirafter $(TOPDIR)/include # -fPIC | |
9 | +CFLAGS += -I$(TOPDIR) -I$(TOPDIR)/include # -fPIC | |
10 | SONAME=libnet-tools.so.0 | |
11 | ||
12 | .SUFFIXES: .a .so | |
13 | diff -up net-tools-1.60/Makefile.makefile-berlios net-tools-1.60/Makefile | |
14 | --- net-tools-1.60/Makefile.makefile-berlios 2009-09-15 18:07:12.000000000 +0200 | |
15 | +++ net-tools-1.60/Makefile 2009-09-15 18:08:25.000000000 +0200 | |
16 | @@ -88,10 +88,9 @@ endif | |
17 | ||
18 | # Compiler and Linker Options | |
19 | # You may need to uncomment and edit these if you are using libc5 and IPv6. | |
20 | -COPTS = -D_GNU_SOURCE -O2 -Wall -g # -I/usr/inet6/include | |
21 | -ifeq ($(origin LOPTS), undefined) | |
22 | -LOPTS = | |
23 | -endif | |
24 | +CFLAGS ?= -O2 -g | |
25 | +CFLAGS += -fno-strict-aliasing # code needs a lot of work before strict aliasing is safe | |
26 | +CPPFLAGS += -D_GNU_SOURCE | |
27 | RESLIB = # -L/usr/inet6/lib -linet6 | |
28 | ||
29 | ifeq ($(HAVE_AFDECnet),1) | |
30 | @@ -119,8 +118,9 @@ CFLAGS += -DHAVE_SELINUX | |
31 | else | |
32 | endif | |
33 | ||
34 | -CFLAGS += $(COPTS) -I. -idirafter ./include/ -I$(NET_LIB_PATH) | |
35 | -LDFLAGS += $(LOPTS) -L$(NET_LIB_PATH) | |
36 | +CPPFLAGS += -I. -I$(TOPDIR)/include -I$(NET_LIB_PATH) | |
37 | +LDFLAGS += -L$(NET_LIB_PATH) | |
38 | + | |
39 | ||
40 | SUBDIRS = man/ $(NET_LIB_PATH)/ | |
41 | ||
42 | @@ -131,8 +131,6 @@ LD = $(CC) | |
43 | ||
44 | NLIB = -l$(NET_LIB_NAME) | |
45 | ||
46 | -MDEFINES = COPTS='$(COPTS)' LOPTS='$(LOPTS)' TOPDIR='$(TOPDIR)' | |
47 | - | |
48 | %.o: %.c config.h version.h intl.h net-features.h $< | |
49 | $(CC) $(CFLAGS) -c $< | |
50 | ||
51 | @@ -181,14 +179,15 @@ $(NET_LIB): config.h version.h intl.h li | |
52 | ||
53 | i18n.h: i18ndir | |
54 | ||
55 | -libdir: | |
56 | - @$(MAKE) -C $(NET_LIB_PATH) $(MDEFINES) | |
57 | +libdir: version.h | |
58 | + @$(MAKE) -C $(NET_LIB_PATH) | |
59 | ||
60 | i18ndir: | |
61 | @$(MAKE) -C po | |
62 | ||
63 | subdirs: | |
64 | - @for i in $(SUBDIRS); do $(MAKE) -C $$i $(MDEFINES) ; done | |
65 | + @for i in $(SUBDIRS); do $(MAKE) -C $$i || exit $$? ; done | |
66 | + | |
67 | ||
68 | ifconfig: $(NET_LIB) ifconfig.o | |
69 | $(CC) $(LDFLAGS) -o ifconfig ifconfig.o $(NLIB) $(RESLIB) |