Changeset 6ef2c11 in mainline for uspace/srv/bd

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/bd

Files:

• ata_bd/Makefile (modified) (1 diff)
• ata_bd/Makefile.build (modified) (1 diff)
• ata_bd/Makefile.common (modified) (1 diff)
• file_bd/Makefile (modified) (1 diff)
• file_bd/Makefile.build (modified) (1 diff)
• file_bd/Makefile.common (modified) (1 diff)
• gxe_bd/Makefile (modified) (1 diff)
• gxe_bd/Makefile.build (modified) (1 diff)
• gxe_bd/Makefile.common (modified) (1 diff)
• part/mbr_part/Makefile (moved) (moved from uspace/srv/char/i8042/Makefile ) (1 diff)
• part/mbr_part/Makefile.build (moved) (moved from uspace/srv/part/mbr_part/Makefile.build ) (1 diff)
• part/mbr_part/Makefile.common (moved) (moved from uspace/srv/part/mbr_part/Makefile.common ) (1 diff)
• part/mbr_part/mbr_part.c (moved) (moved from uspace/srv/part/mbr_part/mbr_part.c )
• rd/Makefile (modified) (1 diff)
• rd/Makefile.build (modified) (1 diff)
• rd/Makefile.common (modified) (1 diff)

uspace/srv/bd/ata_bd/Makefile

@@ -34 +34 @@
 all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBS)
         -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
-        $(MAKE) -f Makefile.build
+        $(MAKE) -f Makefile.build PRECHECK=$(PRECHECK)
 
 clean:
-        rm -f $(DEPEND) $(DEPEND_PREV) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
+        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
         find . -name '*.o' -follow -exec rm \{\} \;

uspace/srv/bd/ata_bd/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/bd/ata_bd/Makefile.common

@@ -37 +37 @@
 DEPEND = Makefile.depend
 DEPEND_PREV = $(DEPEND).prev
+JOB = ata_bd.job
 OUTPUT = ata_bd

uspace/srv/bd/file_bd/Makefile

@@ -34 +34 @@
 all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBS)
         -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
-        $(MAKE) -f Makefile.build
+        $(MAKE) -f Makefile.build PRECHECK=$(PRECHECK)
 
 clean:
-        rm -f $(DEPEND) $(DEPEND_PREV) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
+        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
         find . -name '*.o' -follow -exec rm \{\} \;

uspace/srv/bd/file_bd/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/bd/file_bd/Makefile.common

@@ -37 +37 @@
 DEPEND = Makefile.depend
 DEPEND_PREV = $(DEPEND).prev
+JOB = file_bd.job
 OUTPUT = file_bd

uspace/srv/bd/gxe_bd/Makefile

@@ -34 +34 @@
 all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBS)
         -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
-        $(MAKE) -f Makefile.build
+        $(MAKE) -f Makefile.build PRECHECK=$(PRECHECK)
 
 clean:
-        rm -f $(DEPEND) $(DEPEND_PREV) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
+        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
         find . -name '*.o' -follow -exec rm \{\} \;

uspace/srv/bd/gxe_bd/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/bd/gxe_bd/Makefile.common

@@ -37 +37 @@
 DEPEND = Makefile.depend
 DEPEND_PREV = $(DEPEND).prev
+JOB = gxe_bd.job
 OUTPUT = gxe_bd

uspace/srv/bd/part/mbr_part/Makefile

@@ -34 +34 @@
 all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBS)
         -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
-        $(MAKE) -f Makefile.build
+        $(MAKE) -f Makefile.build PRECHECK=$(PRECHECK)
 
 clean:
-        rm -f $(DEPEND) $(DEPEND_PREV) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
+        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
         find . -name '*.o' -follow -exec rm \{\} \;

uspace/srv/bd/part/mbr_part/Makefile.build

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

uspace/srv/bd/part/mbr_part/Makefile.common

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

uspace/srv/bd/rd/Makefile

@@ -34 +34 @@
 all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBS)
         -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
-        $(MAKE) -f Makefile.build
+        $(MAKE) -f Makefile.build PRECHECK=$(PRECHECK)
 
 clean:
-        rm -f $(DEPEND) $(DEPEND_PREV) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
+        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
         find . -name '*.o' -follow -exec rm \{\} \;

uspace/srv/bd/rd/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/bd/rd/Makefile.common

@@ -37 +37 @@
 DEPEND = Makefile.depend
 DEPEND_PREV = $(DEPEND).prev
+JOB = rd.job
 OUTPUT = rd