Added makefile dependency in both dirs, and proper relinking rule for

oskittcp and ip.

svn path=/trunk/; revision=11222
This commit is contained in:
Art Yerkes
2004-10-08 01:28:32 +00:00
parent f9bf3651a1
commit 068cb50dec
2 changed files with 15 additions and 3 deletions
+5 -1
View File
@@ -1,4 +1,4 @@
# $Id: makefile,v 1.4 2004/10/07 15:04:45 arty Exp $
# $Id: makefile,v 1.5 2004/10/08 01:28:32 arty Exp $
PATH_TO_TOP = ../../..
@@ -44,6 +44,10 @@ TARGET_OBJECTS = \
transport/tcp/tcp.o \
transport/udp/udp.o
preall: all
$(TARGET_OBJECTS):: makefile
include $(PATH_TO_TOP)/rules.mak
include $(TOOLS_PATH)/helper.mk
+10 -2
View File
@@ -1,4 +1,4 @@
# $Id: makefile,v 1.26 2004/10/07 04:47:42 arty Exp $
# $Id: makefile,v 1.27 2004/10/08 01:28:32 arty Exp $
PATH_TO_TOP = ../../..
@@ -45,15 +45,23 @@ TARGET_OBJECTS = \
$(INFO_OBJECTS) \
$(DATALINK_OBJECTS)
preall: $(PATH_TO_TOP)/dk/w32/lib/ip.a $(PATH_TO_TOP)/dk/w32/lib/oskittcp.a
preall: preclean
$(MAKE) -C ../../lib/ip
$(MAKE) -C ../../lib/oskittcp
$(MAKE) all
preclean:
$(RM) $(PATH_TO_TOP)/dk/w32/lib/ip.a \
$(PATH_TO_TOP)/dk/w32/lib/oskittcp.a
$(PATH_TO_TOP)/dk/w32/lib/oskittcp.a:
$(MAKE) -C $(PATH_TO_TOP)/drivers/lib/oskittcp
$(PATH_TO_TOP)/dk/w32/lib/ip.a:
$(MAKE) -C $(PATH_TO_TOP)/drivers/lib/ip
$(TARGET_OBJECTS):: makefile
include $(PATH_TO_TOP)/rules.mak
include $(TOOLS_PATH)/helper.mk