Changeset c47e1a8 in mainline for uspace/srv/dd/Makefile

Timestamp:

2010-05-21T07:50:04Z (15 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

d51ee2b

Parents:

cf8cc36 (diff), 15b592b (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 (rev. 451)

File:

• uspace/srv/dd/Makefile (modified) (2 diffs)

uspace/srv/dd/Makefile

@@ -29 +29 @@
 
 USPACE_PREFIX = ../..
-LIBS = $(LIBC_PREFIX)/libc.a
-
-OUTPUT = dd
+BINARY = dd
 
 SOURCES = \
@@ -39 +37 @@
         intel_piix3.c \
         isa.c \
-        serial.c
+        serial.c \
+        intel_method1.c
 
-#ifeq ($(PROCESSOR), us)
-#        SOURCES += psycho.c
-#endif
-
-#ifeq ($(UARCH), ia32)
-        SOURCES += intel_method1.c
-#endif
-
-
-
-include ../Makefile.common
+include $(USPACE_PREFIX)/Makefile.common