Changeset 6ef2c11 in mainline for uspace/srv/hw/cir

Timestamp:

2010-01-06T20:33:50Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

385a3d6

Parents:

4da7d79 (diff), 23efd30 (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.

Location:

uspace/srv/hw/cir

Files:

• fhc/Makefile (added)
• fhc/Makefile.build (moved) (moved from uspace/srv/cir/fhc/Makefile.build ) (1 diff)
• fhc/Makefile.common (moved) (moved from uspace/srv/console/Makefile.common ) (1 diff)
• fhc/fhc.c (moved) (moved from uspace/srv/cir/fhc/fhc.c )
• obio/Makefile (added)
• obio/Makefile.build (moved) (moved from uspace/srv/cir/obio/Makefile.build ) (1 diff)
• obio/Makefile.common (added)
• obio/obio.c (moved) (moved from uspace/srv/cir/obio/obio.c )

uspace/srv/hw/cir/fhc/Makefile.build

@@ -56 +56 @@
 %.o: %.c $(DEPEND)
         $(CC) $(DEFS) $(CFLAGS) -c $< -o $@
+ifeq ($(PRECHECK),y)
+        $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS)
+endif
 
 $(DEPEND):

uspace/srv/hw/cir/fhc/Makefile.common

@@ -31 +31 @@
 #
 
-LIBC_PREFIX = ../../lib/libc
-SOFTINT_PREFIX = ../../lib/softint
+LIBC_PREFIX = ../../../../lib/libc
+SOFTINT_PREFIX = ../../../../lib/softint
 LIBS = $(LIBC_PREFIX)/libc.a
 
 DEPEND = Makefile.depend
 DEPEND_PREV = $(DEPEND).prev
-OUTPUT = console
+JOB = fhc.job
+OUTPUT = fhc

uspace/srv/hw/cir/obio/Makefile.build

@@ -56 +56 @@
 %.o: %.c $(DEPEND)
         $(CC) $(DEFS) $(CFLAGS) -c $< -o $@
+ifeq ($(PRECHECK),y)
+        $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS)
+endif
 
 $(DEPEND):