|
 |
4a78a73 |
diff -up net-tools-1.60/lib/Makefile.makefile-berlios net-tools-1.60/lib/Makefile
|
|
|
4a78a73 |
--- net-tools-1.60/lib/Makefile.makefile-berlios 2009-09-15 18:07:12.000000000 +0200
|
|
|
4a78a73 |
+++ net-tools-1.60/lib/Makefile 2009-09-15 18:07:12.000000000 +0200
|
|
|
4a78a73 |
@@ -36,7 +36,7 @@ OBJS = $(sort $(VARIA) $(AFOBJS) $(HWOBJ
|
|
|
4a78a73 |
|
|
|
4a78a73 |
# This can be overwritten by the TOPLEVEL Makefile
|
|
|
4a78a73 |
TOPDIR=..
|
|
|
4a78a73 |
-CFLAGS += -I$(TOPDIR) -idirafter $(TOPDIR)/include # -fPIC
|
|
|
4a78a73 |
+CFLAGS += -I$(TOPDIR) -I$(TOPDIR)/include # -fPIC
|
|
|
4a78a73 |
SONAME=libnet-tools.so.0
|
|
|
4a78a73 |
|
|
|
4a78a73 |
.SUFFIXES: .a .so
|
|
|
4a78a73 |
diff -up net-tools-1.60/Makefile.makefile-berlios net-tools-1.60/Makefile
|
|
|
4a78a73 |
--- net-tools-1.60/Makefile.makefile-berlios 2009-09-15 18:07:12.000000000 +0200
|
|
|
4a78a73 |
+++ net-tools-1.60/Makefile 2009-09-15 18:08:25.000000000 +0200
|
|
|
4a78a73 |
@@ -88,10 +88,9 @@ endif
|
|
|
4a78a73 |
|
|
|
4a78a73 |
# Compiler and Linker Options
|
|
|
4a78a73 |
# You may need to uncomment and edit these if you are using libc5 and IPv6.
|
|
|
4a78a73 |
-COPTS = -D_GNU_SOURCE -O2 -Wall -g # -I/usr/inet6/include
|
|
|
4a78a73 |
-ifeq ($(origin LOPTS), undefined)
|
|
|
4a78a73 |
-LOPTS =
|
|
|
4a78a73 |
-endif
|
|
|
4a78a73 |
+CFLAGS ?= -O2 -g
|
|
|
4a78a73 |
+CFLAGS += -fno-strict-aliasing # code needs a lot of work before strict aliasing is safe
|
|
|
4a78a73 |
+CPPFLAGS += -D_GNU_SOURCE
|
|
|
4a78a73 |
RESLIB = # -L/usr/inet6/lib -linet6
|
|
|
4a78a73 |
|
|
|
4a78a73 |
ifeq ($(HAVE_AFDECnet),1)
|
|
|
4a78a73 |
@@ -119,8 +118,9 @@ CFLAGS += -DHAVE_SELINUX
|
|
|
4a78a73 |
else
|
|
|
4a78a73 |
endif
|
|
|
4a78a73 |
|
|
|
4a78a73 |
-CFLAGS += $(COPTS) -I. -idirafter ./include/ -I$(NET_LIB_PATH)
|
|
|
4a78a73 |
-LDFLAGS += $(LOPTS) -L$(NET_LIB_PATH)
|
|
|
4a78a73 |
+CPPFLAGS += -I. -I$(TOPDIR)/include -I$(NET_LIB_PATH)
|
|
|
4a78a73 |
+LDFLAGS += -L$(NET_LIB_PATH)
|
|
|
4a78a73 |
+
|
|
|
4a78a73 |
|
|
|
4a78a73 |
SUBDIRS = man/ $(NET_LIB_PATH)/
|
|
|
4a78a73 |
|
|
|
4a78a73 |
@@ -131,8 +131,6 @@ LD = $(CC)
|
|
|
4a78a73 |
|
|
|
4a78a73 |
NLIB = -l$(NET_LIB_NAME)
|
|
|
4a78a73 |
|
|
|
4a78a73 |
-MDEFINES = COPTS='$(COPTS)' LOPTS='$(LOPTS)' TOPDIR='$(TOPDIR)'
|
|
|
4a78a73 |
-
|
|
|
4a78a73 |
%.o: %.c config.h version.h intl.h net-features.h $<
|
|
|
4a78a73 |
$(CC) $(CFLAGS) -c $<
|
|
|
4a78a73 |
|
|
|
4a78a73 |
@@ -181,14 +179,15 @@ $(NET_LIB): config.h version.h intl.h li
|
|
|
4a78a73 |
|
|
|
4a78a73 |
i18n.h: i18ndir
|
|
|
4a78a73 |
|
|
|
4a78a73 |
-libdir:
|
|
|
4a78a73 |
- @$(MAKE) -C $(NET_LIB_PATH) $(MDEFINES)
|
|
|
4a78a73 |
+libdir: version.h
|
|
|
4a78a73 |
+ @$(MAKE) -C $(NET_LIB_PATH)
|
|
|
4a78a73 |
|
|
|
4a78a73 |
i18ndir:
|
|
|
4a78a73 |
@$(MAKE) -C po
|
|
|
4a78a73 |
|
|
|
4a78a73 |
subdirs:
|
|
|
4a78a73 |
- @for i in $(SUBDIRS); do $(MAKE) -C $$i $(MDEFINES) ; done
|
|
|
4a78a73 |
+ @for i in $(SUBDIRS); do $(MAKE) -C $$i || exit $$? ; done
|
|
|
4a78a73 |
+
|
|
|
4a78a73 |
|
|
|
4a78a73 |
ifconfig: $(NET_LIB) ifconfig.o
|
|
|
4a78a73 |
$(CC) $(LDFLAGS) -o ifconfig ifconfig.o $(NLIB) $(RESLIB)
|