diff options
Diffstat (limited to 'networking')
-rw-r--r-- | networking/Makefile | 10 | ||||
-rw-r--r-- | networking/Makefile.in | 7 | ||||
-rw-r--r-- | networking/libiproute/Makefile | 10 | ||||
-rw-r--r-- | networking/libiproute/Makefile.in | 6 | ||||
-rw-r--r-- | networking/udhcp/Makefile | 10 | ||||
-rw-r--r-- | networking/udhcp/Makefile.in | 5 |
6 files changed, 31 insertions, 17 deletions
diff --git a/networking/Makefile b/networking/Makefile index 456c433fd..91726b1b2 100644 --- a/networking/Makefile +++ b/networking/Makefile | |||
@@ -17,13 +17,15 @@ | |||
17 | # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 17 | # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
18 | # | 18 | # |
19 | 19 | ||
20 | TOPDIR:= ../ | 20 | top_srcdir=.. |
21 | top_builddir=.. | ||
22 | srcdir=$(top_srcdir)/networking | ||
21 | NETWORKING_DIR:=./ | 23 | NETWORKING_DIR:=./ |
22 | include $(TOPDIR).config | 24 | include $(top_builddir)/Rules.mak |
23 | include $(TOPDIR)Rules.mak | 25 | include $(top_builddir)/.config |
24 | include Makefile.in | 26 | include Makefile.in |
25 | all: $(libraries-y) | 27 | all: $(libraries-y) |
26 | -include $(TOPDIR).depend | 28 | -include $(top_builddir)/.depend |
27 | 29 | ||
28 | clean: | 30 | clean: |
29 | rm -f *.o *.a $(AR_TARGET) | 31 | rm -f *.o *.a $(AR_TARGET) |
diff --git a/networking/Makefile.in b/networking/Makefile.in index e15e61a3e..9bfe90176 100644 --- a/networking/Makefile.in +++ b/networking/Makefile.in | |||
@@ -19,9 +19,9 @@ | |||
19 | 19 | ||
20 | NETWORKING_AR:=networking.a | 20 | NETWORKING_AR:=networking.a |
21 | ifndef $(NETWORKING_DIR) | 21 | ifndef $(NETWORKING_DIR) |
22 | NETWORKING_DIR:=$(TOPDIR)networking/ | 22 | NETWORKING_DIR:=$(top_builddir)/networking/ |
23 | endif | 23 | endif |
24 | 24 | srcdir=$(top_srcdir)/networking | |
25 | NETWORKING-y:= | 25 | NETWORKING-y:= |
26 | NETWORKING-$(CONFIG_ARPING) += arping.o | 26 | NETWORKING-$(CONFIG_ARPING) += arping.o |
27 | NETWORKING-$(CONFIG_FTPGET) += ftpgetput.o | 27 | NETWORKING-$(CONFIG_FTPGET) += ftpgetput.o |
@@ -63,3 +63,6 @@ endif | |||
63 | $(NETWORKING_DIR)$(NETWORKING_AR): $(patsubst %,$(NETWORKING_DIR)%, $(NETWORKING-y)) | 63 | $(NETWORKING_DIR)$(NETWORKING_AR): $(patsubst %,$(NETWORKING_DIR)%, $(NETWORKING-y)) |
64 | $(AR) -ro $@ $(patsubst %,$(NETWORKING_DIR)%, $(NETWORKING-y)) | 64 | $(AR) -ro $@ $(patsubst %,$(NETWORKING_DIR)%, $(NETWORKING-y)) |
65 | 65 | ||
66 | $(NETWORKING_DIR)%.o: $(srcdir)/%.c | ||
67 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $< | ||
68 | |||
diff --git a/networking/libiproute/Makefile b/networking/libiproute/Makefile index 0dc7191d3..d3aefaaf4 100644 --- a/networking/libiproute/Makefile +++ b/networking/libiproute/Makefile | |||
@@ -17,13 +17,15 @@ | |||
17 | # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 17 | # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
18 | # | 18 | # |
19 | 19 | ||
20 | TOPDIR:= ../../ | 20 | top_srcdir=../.. |
21 | top_builddir=../.. | ||
22 | srcdir=$(top_srcdir)/networking/libiproute | ||
21 | LIBIPROUTE_DIR:=./ | 23 | LIBIPROUTE_DIR:=./ |
22 | include $(TOPDIR).config | 24 | include $(top_builddir)/Rules.mak |
23 | include $(TOPDIR)Rules.mak | 25 | include $(top_builddir)/.config |
24 | include Makefile.in | 26 | include Makefile.in |
25 | all: $(libraries-y) | 27 | all: $(libraries-y) |
26 | -include $(TOPDIR).depend | 28 | -include $(top_builddir)/.depend |
27 | 29 | ||
28 | clean: | 30 | clean: |
29 | rm -f *.o *.a $(AR_TARGET) | 31 | rm -f *.o *.a $(AR_TARGET) |
diff --git a/networking/libiproute/Makefile.in b/networking/libiproute/Makefile.in index 25c51999f..fcc7f48ce 100644 --- a/networking/libiproute/Makefile.in +++ b/networking/libiproute/Makefile.in | |||
@@ -19,8 +19,9 @@ | |||
19 | 19 | ||
20 | LIBIPROUTE_AR:=libiproute.a | 20 | LIBIPROUTE_AR:=libiproute.a |
21 | ifndef $(LIBIPROUTE_DIR) | 21 | ifndef $(LIBIPROUTE_DIR) |
22 | LIBIPROUTE_DIR:=$(TOPDIR)networking/libiproute/ | 22 | LIBIPROUTE_DIR:=$(top_builddir)/networking/libiproute/ |
23 | endif | 23 | endif |
24 | srcdir=$(top_srcdir)/networking/libiproute | ||
24 | 25 | ||
25 | LIBIPROUTE-$(CONFIG_IP) += \ | 26 | LIBIPROUTE-$(CONFIG_IP) += \ |
26 | ip_parse_common_args.o \ | 27 | ip_parse_common_args.o \ |
@@ -78,3 +79,6 @@ libraries-y+=$(LIBIPROUTE_DIR)$(LIBIPROUTE_AR) | |||
78 | $(LIBIPROUTE_DIR)$(LIBIPROUTE_AR): $(patsubst %,$(LIBIPROUTE_DIR)%, $(LIBIPROUTE-y)) | 79 | $(LIBIPROUTE_DIR)$(LIBIPROUTE_AR): $(patsubst %,$(LIBIPROUTE_DIR)%, $(LIBIPROUTE-y)) |
79 | $(AR) -ro $@ $(patsubst %,$(LIBIPROUTE_DIR)%, $(LIBIPROUTE-y)) | 80 | $(AR) -ro $@ $(patsubst %,$(LIBIPROUTE_DIR)%, $(LIBIPROUTE-y)) |
80 | 81 | ||
82 | $(LIBIPROUTE_DIR)%.o: $(srcdir)/%.c | ||
83 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $< | ||
84 | |||
diff --git a/networking/udhcp/Makefile b/networking/udhcp/Makefile index 2b79d2293..3d32db50a 100644 --- a/networking/udhcp/Makefile +++ b/networking/udhcp/Makefile | |||
@@ -17,13 +17,15 @@ | |||
17 | # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 17 | # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
18 | # | 18 | # |
19 | 19 | ||
20 | TOPDIR:= ../../ | 20 | top_srcdir=../.. |
21 | top_builddir=../.. | ||
22 | srcdir=$(top_srcdir)/networking/udhcp | ||
21 | UDHCP_DIR:=./ | 23 | UDHCP_DIR:=./ |
22 | include $(TOPDIR).config | 24 | include $(top_builddir)/Rules.mak |
23 | include $(TOPDIR)Rules.mak | 25 | include $(top_builddir)/.config |
24 | include Makefile.in | 26 | include Makefile.in |
25 | all: $(libraries-y) | 27 | all: $(libraries-y) |
26 | -include $(TOPDIR).depend | 28 | -include $(top_builddir)/.depend |
27 | 29 | ||
28 | clean: | 30 | clean: |
29 | rm -f *.o *.a $(AR_TARGET) | 31 | rm -f *.o *.a $(AR_TARGET) |
diff --git a/networking/udhcp/Makefile.in b/networking/udhcp/Makefile.in index b48079429..2d7a08816 100644 --- a/networking/udhcp/Makefile.in +++ b/networking/udhcp/Makefile.in | |||
@@ -19,8 +19,9 @@ | |||
19 | 19 | ||
20 | UDHCP_AR:=udhcp.a | 20 | UDHCP_AR:=udhcp.a |
21 | ifndef $(UDHCP_DIR) | 21 | ifndef $(UDHCP_DIR) |
22 | UDHCP_DIR:=$(TOPDIR)networking/udhcp/ | 22 | UDHCP_DIR:=$(top_builddir)/networking/udhcp/ |
23 | endif | 23 | endif |
24 | srcdir=$(top_srcdir)/networking/udhcp | ||
24 | 25 | ||
25 | #ok, so I forgot how to do an or, but this is a quick and dirty hack | 26 | #ok, so I forgot how to do an or, but this is a quick and dirty hack |
26 | ifeq ($(CONFIG_UDHCPC), y) | 27 | ifeq ($(CONFIG_UDHCPC), y) |
@@ -48,6 +49,6 @@ libraries-y+=$(UDHCP_DIR)$(UDHCP_AR) | |||
48 | $(UDHCP_DIR)$(UDHCP_AR): $(UDHCP_OBJS) | 49 | $(UDHCP_DIR)$(UDHCP_AR): $(UDHCP_OBJS) |
49 | $(AR) -ro $@ $(UDHCP_OBJS) | 50 | $(AR) -ro $@ $(UDHCP_OBJS) |
50 | 51 | ||
51 | $(UDHCP_OBJS): %.o : %.c | 52 | $(UDHCP_OBJS): $(UDHCP_DIR)%.o : $(srcdir)/%.c |
52 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -DIN_BUSYBOX -c $< -o $@ | 53 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -DIN_BUSYBOX -c $< -o $@ |
53 | 54 | ||