Changeset 6efb4d2 in mainline for uspace/app/msim/Makefile

Timestamp:

2012-05-04T09:45:34Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

1a23f6e

Parents:

7360332

Message:

Reorganize HelenOS specific files for MSIM

File:

• uspace/app/msim/Makefile (modified) (4 diffs)

uspace/app/msim/Makefile

@@ -36 +36 @@
 
 MSIM_HELENOS_MAKEFILE = Makefile.msim.src
-MSIM_HELENOS_PLATFORM_FILES = helenos.c helenos_input.c
+MSIM_HELENOS_PLATFORM_FILES = misc.c input.c
+MSIM_HELENOS_ARCH_DIR = arch/helenos
 MSIM_PATCHED_FILES = \
         $(MSIM_DIST)/config.h \
         $(MSIM_DIST)/src/$(MSIM_HELENOS_MAKEFILE) \
-        $(MSIM_DIST)/src/helenos.c \
-        $(MSIM_DIST)/src/helenos_input.c
+        $(MSIM_DIST)/src/$(MSIM_HELENOS_ARCH_DIR)/helenos.h \
+        $(MSIM_DIST)/src/$(MSIM_HELENOS_ARCH_DIR)/misc.c \
+        $(MSIM_DIST)/src/$(MSIM_HELENOS_ARCH_DIR)/input.c
+
+MSIM_EXTRA_SOURCES := $(addprefix $(MSIM_HELENOS_ARCH_DIR)/,$(MSIM_HELENOS_PLATFORM_FILES))
 
 CP = /bin/cp -f
@@ -63 +67 @@
         $(CP) $< $@
 
-$(MSIM_DIST)/src/helenos.c: helenos.c | unpack-tarball
+$(MSIM_DIST)/src/$(MSIM_HELENOS_ARCH_DIR)/helenos.h: arch_helenos/helenos.h | unpack-tarball
         $(CP) $< $@
 
-$(MSIM_DIST)/src/helenos_input.c: helenos_input.c | unpack-tarball
+$(MSIM_DIST)/src/$(MSIM_HELENOS_ARCH_DIR)/misc.c: arch_helenos/misc.c | unpack-tarball
+        $(CP) $< $@
+
+$(MSIM_DIST)/src/$(MSIM_HELENOS_ARCH_DIR)/input.c: arch_helenos/input.c | unpack-tarball
         $(CP) $< $@
 
@@ -79 +86 @@
         ) | make -f - | grep 'SOURCES' >Makefile.sources
         sed \
-                -e 's:io/input.c:$(MSIM_HELENOS_PLATFORM_FILES):' \
+                -e 's:io/input.c:$(MSIM_EXTRA_SOURCES):' \
                 -e 's:debug/gdb.c::' \
                 -e 's:arch/posix/stdin.c::' \
@@ -90 +97 @@
 unpack-tarball: $(MSIM_TARBALL)
         tar xjf $(MSIM_TARBALL)
+        mkdir -p $(MSIM_DIST)/src/$(MSIM_HELENOS_ARCH_DIR)