get rid of project as a container of code, flatten it one level

multirom-nexus6p · Jan 25, 2009 · 577036f · 577036f
1 parent c676001
commit 577036f
Show file tree

Hide file tree

Showing 18 changed files with 26 additions and 400 deletions.
diff --git a/makefile b/makefile
@@ -54,7 +54,7 @@ EXTRA_BUILDDEPS :=
 # any rules you put here will be depended on in clean builds
 EXTRA_CLEANDEPS := 
 
-include project/$(PROJECT)/rules.mk
+include project/$(PROJECT).mk
 include target/$(TARGET)/rules.mk
 include platform/$(PLATFORM)/rules.mk
 include arch/$(ARCH)/rules.mk

diff --git a/project/armemu-test.mk b/project/armemu-test.mk
@@ -0,0 +1,16 @@
+# top level project rules for the armemu-test project
+#
+LOCAL_DIR := $(GET_LOCAL_DIR)
+
+TARGET := armemu
+MODULES += \
+	app/tests \
+	app/shell
+
+# extra rules to copy the armemu.conf file to the build dir
+#$(BUILDDIR)/armemu.conf: $(LOCAL_DIR)/armemu.conf
+#	@echo copy $< to $@
+#	$(NOECHO)cp $< $@
+
+#EXTRA_BUILDDEPS += $(BUILDDIR)/armemu.conf
+#GENERATED += $(BUILDDIR)/armemu.conf
diff --git a/project/armemu-test/armemu.conf b/project/armemu-test/armemu.conf
diff --git a/project/armemu-test/init.c b/project/armemu-test/init.c
diff --git a/project/armemu-test/rules.mk b/project/armemu-test/rules.mk
diff --git a/project/beagle-test/rules.mk → project/beagle-test.mk b/project/beagle-test/rules.mk → project/beagle-test.mk
@@ -7,8 +7,5 @@ TARGET := beagle
 MODULES += \
 	app/tests \
 	app/stringtests \
-	lib/console
-
-OBJS += \
-	$(LOCAL_DIR)/init.o
+	app/shell
 
diff --git a/project/beagle-test/init.c b/project/beagle-test/init.c
diff --git a/project/beagle-test/usb_descriptors.h b/project/beagle-test/usb_descriptors.h
diff --git a/project/osk5912-test/rules.mk → project/osk5912-test.mk b/project/osk5912-test/rules.mk → project/osk5912-test.mk
@@ -5,8 +5,6 @@ LOCAL_DIR := $(GET_LOCAL_DIR)
 TARGET := osk5912
 MODULES += \
 	app/tests \
-	lib/console
-
-OBJS += \
-	$(LOCAL_DIR)/init.o
+	app/stringtests \
+	app/shell
 
diff --git a/project/osk5912-test/armemu.conf b/project/osk5912-test/armemu.conf
diff --git a/project/osk5912-test/init.c b/project/osk5912-test/init.c
diff --git a/project/qemu-arm-test/rules.mk → project/qemu-arm-test.mk b/project/qemu-arm-test/rules.mk → project/qemu-arm-test.mk
@@ -4,8 +4,6 @@ LOCAL_DIR := $(GET_LOCAL_DIR)
 
 TARGET := qemu-arm
 MODULES += \
-	app/tests
-
-OBJS += \
-	$(LOCAL_DIR)/init.o
-
+	app/tests \
+	app/shell
+
diff --git a/project/qemu-arm-test/init.c b/project/qemu-arm-test/init.c
diff --git a/project/qemu-arm-test/runqemu b/project/qemu-arm-test/runqemu
diff --git a/project/sam7ex256-test/rules.mk → project/sam7ex256-test.mk b/project/sam7ex256-test/rules.mk → project/sam7ex256-test.mk
@@ -4,7 +4,6 @@ LOCAL_DIR := $(GET_LOCAL_DIR)
 
 TARGET := sam7ex256
 MODULES += \
-	app/tests
+	app/tests \
+	app/shell
 
-OBJS += \
-	$(LOCAL_DIR)/init.o