Changeset bfd7aac in mainline for boot/Makefile.common

Timestamp:

2010-02-17T19:19:08Z (14 years ago)

Author:

Lukas Mejdrech <lukasmejdrech@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

1e2e0c1e

Parents:

01a9ef5 (diff), b8da2a3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• boot/Makefile.common (modified) (1 diff)

boot/Makefile.common

@@ -102 +102 @@
         $(USPACEDIR)/srv/net/app/nettest2/nettest2
 
+ifneq ($(NETWORKING), none)
 NET_CFG = \
         $(USPACEDIR)/srv/net/cfg/$(NETWORKING)/general \
         $(USPACEDIR)/srv/net/cfg/$(NETWORKING)/lo \
         $(USPACEDIR)/srv/net/cfg/$(NETWORKING)/ne2k
+endif
 
 ifeq ($(NETWORKING), module)