Changeset cf240cb in mainline

Timestamp:

2010-01-16T19:15:02Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

079f440

Parents:

15eeb93

Message:

Common make rules for libraries (except libc).

Location:

uspace/lib

Files:

• Makefile.common (moved) (moved from uspace/lib/softint/Makefile.build ) (1 diff)
• libblock/Makefile (modified) (1 diff)
• libblock/Makefile.build (deleted)
• libblock/Makefile.common (deleted)
• libfs/Makefile (modified) (1 diff)
• libfs/Makefile.build (deleted)
• libfs/Makefile.common (deleted)
• libpci/Makefile (modified) (1 diff)
• libpci/Makefile.build (deleted)
• libpci/Makefile.common (deleted)
• softfloat/Makefile (modified) (1 diff)
• softfloat/Makefile.build (deleted)
• softfloat/Makefile.common (deleted)
• softint/Makefile (modified) (1 diff)
• softint/Makefile.common (deleted)

uspace/lib/Makefile.common

@@ -28 +28 @@
 #
 
-## Setup toolchain
+## Common rules for building apps.
 #
 
-include Makefile.common
-include $(LIBC_PREFIX)/Makefile.toolchain
-
-CFLAGS += -Iinclude
-
-## Sources
+# Individual makefiles set:
+#
+#       USPACE_PREFIX   relative path to uspace/ directory
+#       LIBS            libraries to link with (with relative path)
+#       EXTRA_CFLAGS    additional flags to pass to C compiler
+#       JOB             job file name (like appname.job)
+#       OUTPUT          output binary name (like appname)
+#       SOURCES         list of source files
 #
 
-SOURCES = \
-        generic/division.c\
-        generic/multiplication.c
+DEPEND = Makefile.depend
+DEPEND_PREV = $(DEPEND).prev
+
+LIBC_PREFIX = $(USPACE_PREFIX)/lib/libc
+
+JOB = $(OUTPUT).job
 
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
 
-.PHONY: all
+include $(LIBC_PREFIX)/Makefile.toolchain
 
-all: $(LIBSOFTINT)
+CFLAGS += $(EXTRA_CFLAGS)
+
+.PHONY: all build clean
+
+all: \
+    $(LIBC_PREFIX)/../../../version \
+    $(LIBC_PREFIX)/../../../Makefile.config \
+    $(LIBC_PREFIX)/../../../config.h \
+    $(LIBC_PREFIX)/../../../config.defs \
+    $(LIBS) \
+    \
+    $(OUTPUT)
+        -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
+
+clean:
+        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT)
+        find . -name '*.o' -follow -exec rm \{\} \;
+
+build: 
 
 -include $(DEPEND)
 
-$(LIBSOFTINT): $(OBJECTS)
+$(OUTPUT): $(OBJECTS)
         $(AR) rc $@ $(OBJECTS)
 

uspace/lib/libblock/Makefile

@@ -28 +28 @@
 #
 
-include Makefile.common
+USPACE_PREFIX = ../..
+LIBS = $(LIBC_PREFIX)/libc.a
 
-.PHONY: all clean
+OUTPUT = libblock.a
 
-all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBC_PREFIX)/libc.a
-        -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
-        $(MAKE) -f Makefile.build PRECHECK=$(PRECHECK)
+SOURCES = \
+        libblock.c
 
-clean:
-        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(LIBBLOCK)
-        find . -name '*.o' -follow -exec rm \{\} \;
+include ../Makefile.common

uspace/lib/libfs/Makefile

@@ -28 +28 @@
 #
 
-include Makefile.common
+USPACE_PREFIX = ../..
+LIBS = $(LIBC_PREFIX)/libc.a
 
-.PHONY: all clean
+OUTPUT = libfs.a
 
-all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBC_PREFIX)/libc.a
-        -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
-        $(MAKE) -f Makefile.build PRECHECK=$(PRECHECK)
+SOURCES = \
+        libfs.c
 
-clean:
-        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(LIBFS)
-        find . -name '*.o' -follow -exec rm \{\} \;
+include ../Makefile.common

uspace/lib/libpci/Makefile

@@ -28 +28 @@
 #
 
-include Makefile.common
+USPACE_PREFIX = ../..
+LIBS = $(LIBC_PREFIX)/libc.a
 
-.PHONY: all clean
+OUTPUT = libpci.a
 
-all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBC_PREFIX)/libc.a
-        -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
-        $(MAKE) -f Makefile.build PRECHECK=$(PRECHECK)
+SOURCES = \
+        access.c \
+        generic.c \
+        names.c \
+        i386-ports.c
 
-clean:
-        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(LIBPCI)
-        find . -name '*.o' -follow -exec rm \{\} \;
+include ../Makefile.common

uspace/lib/softfloat/Makefile

@@ -28 +28 @@
 #
 
-include Makefile.common
+USPACE_PREFIX = ../..
+LIBS = $(LIBC_PREFIX)/libc.a
+EXTRA_CFLAGS += -Iinclude -Iarch/$(UARCH)/include/
 
-.PHONY: all clean
+OUTPUT = libsoftfloat.a
 
-all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBC_PREFIX)/libc.a
-        -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
-        $(MAKE) -f Makefile.build PRECHECK=$(PRECHECK)
+SOURCES = \
+        generic/add.c \
+        generic/common.c \
+        generic/comparison.c \
+        generic/conversion.c \
+        generic/div.c \
+        generic/mul.c \
+        generic/other.c \
+        generic/softfloat.c \
+        generic/sub.c
 
-clean:
-        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(LIBSOFTFLOAT)
-        find . -name '*.o' -follow -exec rm \{\} \;
+include ../Makefile.common

uspace/lib/softint/Makefile

@@ -28 +28 @@
 #
 
-include Makefile.common
+USPACE_PREFIX = ../..
+LIBS = $(LIBC_PREFIX)/libc.a
+EXTRA_CFLAGS = -Iinclude
 
-.PHONY: all clean
+OUTPUT = libsoftint.a
 
-all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBC_PREFIX)/libc.a
-        -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
-        $(MAKE) -f Makefile.build PRECHECK=$(PRECHECK)
+SOURCES = \
+        generic/division.c\
+        generic/multiplication.c
 
-clean:
-        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(LIBSOFTINT)
-        find . -name '*.o' -follow -exec rm \{\} \;
+include ../Makefile.common