Changeset 383ddd6 in mainline for uspace/app/Makefile.common

Timestamp:

2010-01-20T20:33:55Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

975e7e9

Parents:

6c01702 (diff), 3c081d0e (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:

• uspace/app/Makefile.common (moved) (moved from uspace/app/bdsh/Makefile.build ) (1 diff)

uspace/app/Makefile.common

@@ -28 +28 @@
 #
 
-## Setup toolchain
+## Common rules for building apps.
 #
 
-include Makefile.common
-include $(LIBC_PREFIX)/Makefile.toolchain
-
-CFLAGS += -I$(LIBBLOCK_PREFIX) -I. -Icmds/ -Icmds/builtins -Icmds/modules
-
-## 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 = \
-        cmds/modules/help/help.c \
-        cmds/modules/mkdir/mkdir.c \
-        cmds/modules/mkfile/mkfile.c \
-        cmds/modules/rm/rm.c \
-        cmds/modules/bdd/bdd.c \
-        cmds/modules/cat/cat.c \
-        cmds/modules/touch/touch.c \
-        cmds/modules/ls/ls.c \
-        cmds/modules/pwd/pwd.c \
-        cmds/modules/sleep/sleep.c \
-        cmds/modules/cp/cp.c \
-        cmds/modules/mv/mv.c \
-        cmds/modules/mount/mount.c \
-        cmds/modules/kcon/kcon.c \
-        cmds/builtins/exit/exit.c \
-        cmds/builtins/cd/cd.c \
-        cmds/mod_cmds.c \
-        cmds/builtin_cmds.c \
-        errors.c \
-        input.c \
-        util.c \
-        exec.c \
-        scli.c
+DEPEND = Makefile.depend
+DEPEND_PREV = $(DEPEND).prev
+
+LIBC_PREFIX = $(USPACE_PREFIX)/lib/libc
+LIBBLOCK_PREFIX = $(USPACE_PREFIX)/lib/libblock
+SOFTINT_PREFIX = $(USPACE_PREFIX)/lib/softint
+
+JOB = $(OUTPUT).job
 
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
 
-.PHONY: all
+include $(LIBC_PREFIX)/Makefile.toolchain
 
-all: $(OUTPUT) $(OUTPUT).disasm
+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) $(OUTPUT).disasm
+        -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
+
+clean:
+        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
+        find . -name '*.o' -follow -exec rm \{\} \;
+
+build: 
 
 -include $(DEPEND)