[uml-devel] uml 2.6.1 kbuild simplifications

[Ingo Molnar <mingo@elte.hu>]

i've attached a few makefile simplifications/cleanups below, against
your 2.6.1 UML tree. The UML build will be less verbose as well.

parallel make still does not work though - doing 'make -j10' after a
'make clean' fails. Couldnt figure out a solution, the dependencies are
really nasty.

	Ingo

--- linux/arch/um/sys-i386/util/Makefile.orig2	
+++ linux/arch/um/sys-i386/util/Makefile	
@@ -1,12 +1,9 @@
 
-host-progs	:= mk_sc
-always		:= $(host-progs) mk_thread
-targets		:= mk_thread_kern.o mk_thread_user.o
+host-progs	:= mk_sc mk_thread
+always		:= $(host-progs)
 
-mk_sc-objs	:= mk_sc.o
+mk_thread-objs	:= mk_thread_kern.o mk_thread_user.o
 
-$(obj)/mk_thread : $(obj)/mk_thread_kern.o $(obj)/mk_thread_user.o
-	$(HOSTCC) $(CFLAGS) -o $@ $^
+HOSTCFLAGS_mk_thread_kern.o := $(CFLAGS)
+HOSTCFLAGS_mk_thread_user.o := $(USER_CFLAGS)
 
-$(obj)/mk_thread_user.o : $(src)/mk_thread_user.c
-	$(HOSTCC) $(USER_CFLAGS) -c -o $@ $<
--- linux/arch/um/util/Makefile.orig2	
+++ linux/arch/um/util/Makefile	
@@ -1,18 +1,10 @@
-always		:= mk_task mk_constants
-targets		:= mk_task_user.o mk_task_kern.o \
-		   mk_constants_user.o mk_constants_kern.o
 
-$(obj)/mk_task: $(obj)/mk_task_user.o $(obj)/mk_task_kern.o
-	$(HOSTCC) -o $@ $^
+host-progs		:= mk_task mk_constants
+always			:= $(host-progs)
 
-$(obj)/mk_task_user.o: $(src)/mk_task_user.c
-	$(HOSTCC) -o $@ -c $< 
+mk_task-objs		:= mk_task_user.o mk_task_kern.o
+mk_constants-objs	:= mk_constants_user.o mk_constants_kern.o
 
-$(obj)/mk_constants : $(obj)/mk_constants_user.o $(obj)/mk_constants_kern.o
-	$(HOSTCC) -o $@ $^
+HOSTCFLAGS_mk_task_kern.o	:= $(CFLAGS)
+HOSTCFLAGS_mk_constants_kern.o	:= $(CFLAGS)
 
-$(obj)/mk_constants_user.o : $(src)/mk_constants_user.c
-	$(HOSTCC) -c $< -o $@
-
-$(obj)/mk_constants_kern.o : $(src)/mk_constants_kern.c
-	$(HOSTCC) $(CFLAGS) -c $< -o $@
--- linux/arch/um/Makefile.orig2	
+++ linux/arch/um/Makefile	
@@ -157,7 +157,8 @@ MRPROPER_FILES += $(SYMLINK_HEADERS) $(A
 		$(addprefix $(ARCH_DIR)/kernel/,$(KERN_SYMLINKS))
 
 $(ARCH_DIR)/main.o: $(ARCH_DIR)/main.c sys_prepare
-	$(CC) $(USER_CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
+	@ echo '  MAIN    $@'
+	@ $(CC) $(USER_CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
 
 archmrproper:
 	@:
@@ -169,13 +170,12 @@ archmrproper:
 #		$(addprefix $(ARCH_DIR)/kernel/,$(KERN_SYMLINKS))
 
 archclean:
-#	$(Q)for d in $(ARCH_SUBDIRS) $(ARCH_DIR)/util; \
-#	do \
-#		$(MAKE) $(clean)=$$d; \
-#	done
+	$(Q)for d in $(ARCH_SUBDIRS) $(ARCH_DIR)/util; \
+	do \
+		$(MAKE) $(clean)=$$d; \
+	done
 	@find . \( -name '*.bb' -o -name '*.bbg' -o -name '*.da' \
 		-o -name '*.gcov' \) -type f -print | xargs rm -f
-#	rm -f $(CLEAN_FILES)
 
 $(SYMLINK_HEADERS):
 	cd $(TOPDIR)/$(dir $@) ; \


-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn
_______________________________________________
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel