kbuild: arch/um cleanup / O_TARGET removal

arch/um/Makefile

@@ -35,14 +35,12 @@ ARCH_SUBDIRS = $(ARCH_DIR)/drivers $(ARCH_DIR)/kernel \
 
 SUBDIRS += $(ARCH_SUBDIRS)
 
-LIBS += $(ARCH_DIR)/kernel/um.o \
-	$(ARCH_DIR)/drivers/drivers.o \
-	$(ARCH_DIR)/sys-$(SUBARCH)/sys.o $(ARCH_DIR)/os/os.o
+core-y			+= $(ARCH_DIR)/kernel/		 \
+			+= $(ARCH_DIR)/drivers/          \
+			+= $(ARCH_DIR)/sys-$(SUBARCH)/	 \
+			+= $(ARCH_DIR)/os-$(OS)/
 
-ifeq ($(CONFIG_PT_PROXY), y)
-SUBDIRS += $(ARCH_DIR)/ptproxy
-LIBS += $(ARCH_DIR)/ptproxy/ptproxy.a
-endif
+libs-$(CONFIG_PT_PROXY)	+= $(ARCH_DIR)/ptproxy/
 
 ARCH_INCLUDE = $(TOPDIR)/$(ARCH_DIR)/include
 

arch/um/drivers/Makefile

@@ -3,13 +3,8 @@
 # Licensed under the GPL
 #
 
-O_TARGET := drivers.o 
-
 CHAN_OBJS := chan_kern.o chan_user.o line.o 
 
-list-multi := slip.o daemon.o mcast.o mconsole.o net.o ubd.o hostaudio.o \
-	port.o harddog.o
-
 slip-objs := slip_kern.o slip_user.o
 daemon-objs := daemon_kern.o daemon_user.o
 mcast-objs := mcast_kern.o mcast_user.o
@@ -60,25 +55,5 @@ fastdep:
 
 dep:
 
-archmrproper:
-
-daemon.o : $(daemon-objs)
-
-slip.o : $(slip-objs)
-
-mcast.o : $(mcast-objs)
-
-mconsole.o : $(mconsole-objs)
-
-net.o : $(net-objs)
-
-hostaudio.o : $(hostaudio-objs)
-
-ubd.o : $(ubd-objs)
-
-port.o : $(port-objs)
-
-harddog.o : $(harddog-objs)
+archmrproper: clean
 
-$(list-multi) : # This doesn't work, but should : '%.o : $(%-objs)'
-	$(LD) $(LD_RFLAG) -r -o $@ $($(patsubst %.o,%,$@)-objs)

arch/um/kernel/Makefile

-O_TARGET = um.o
+
+EXTRA_TARGETS	:= unmap_fin.o
 
 obj-y = config.o exec_kern.o exec_user.o exitcode.o frame_kern.o frame.o \
 	helper.o init_task.o irq.o irq_user.o ksyms.o mem.o mem_user.o \
@@ -8,17 +9,16 @@ obj-y = config.o exec_kern.o exec_user.o exitcode.o frame_kern.o frame.o \
 	time_kern.o tlb.o trap_kern.o trap_user.o uaccess_user.o um_arch.o \
 	umid.o user_util.o
 
-ifeq ($(CONFIG_BLK_DEV_INITRD), y)
-  obj-y += initrd_kern.o initrd_user.o
+obj-$(CONFIG_BLK_DEV_INITRD) += initrd_kern.o initrd_user.o
 endif
 
 # user_syms.o not included here because Rules.make has its own ideas about
 # building anything in export-objs
 
 USER_OBJS = $(filter %_user.o,$(obj-y)) config.o process.o time.o umid.o \
-	user_util.o user_syms.o helper.o
+	user_util.o user_syms.o helper.o tty_log.o
 
-export-objs := ksyms.o process_kern.o signal_kern.o
+export-objs := ksyms.o process_kern.o signal_kern.o gprof_syms.o gmon_syms.o
 
 UNMAP_CFLAGS := $(patsubst -pg -DPROFILING,,$(USER_CFLAGS))
 UNMAP_CFLAGS := $(patsubst -fprofile-arcs -ftest-coverage,,$(UNMAP_CFLAGS))
@@ -31,21 +31,9 @@ ifeq ($(CONFIG_MODVERSIONS), y)
   DMODVERSIONS = -D__CONFIG_MODVERSIONS__
 endif
 
-ifeq ($(CONFIG_GPROF), y)
-    obj-y += gprof_syms.o
-    export-objs += gprof_syms.o
-endif
-
-ifeq ($(CONFIG_GCOV), y)
-    obj-y += gmon_syms.o
-    export-objs += gmon_syms.o
-endif
-
-ifeq ($(CONFIG_TTY_LOG), y)
-    obj-y += tty_log.o
-    USER_OBJS += tty_log.o
-endif
-
+obj-$(CONFIG_GPROF)	+= gprof_syms.o
+obj-$(CONFIG_GCOV)	+= gmon_syms.o
+obj-$(CONFIG_TTY_LOG)	+= tty_log.o
 
 CFLAGS_user_syms.o = -D__AUTOCONF_INCLUDED__ $(DMODULES) $(DMODVERSIONS) \
 	-I/usr/include -I../include
@@ -54,8 +42,6 @@ CFLAGS_frame.o := $(patsubst -fomit-frame-pointer,,$(USER_CFLAGS))
 
 include $(TOPDIR)/Rules.make
 
-$(O_TARGET) : unmap_fin.o
-
 $(USER_OBJS) : %.o: %.c
 	$(CC) $(CFLAGS_$@) $(USER_CFLAGS) -c -o $@ $<
 

arch/um/os-Linux/Makefile

@@ -3,8 +3,6 @@
 # Licensed under the GPL
 #
 
-O_TARGET = os.o
-
 obj-y = file.o process.o tty.o
 
 include $(TOPDIR)/Rules.make

arch/um/os-Linux/drivers/Makefile

@@ -3,10 +3,6 @@
 # Licensed under the GPL
 #
 
-O_TARGET := drivers.o
-
-list-multi := tuntap.o ethertap.o
-
 ethertap-objs := ethertap_kern.o ethertap_user.o
 tuntap-objs := tuntap_kern.o tuntap_user.o
 
@@ -22,10 +18,3 @@ include $(TOPDIR)/Rules.make
 
 $(USER_OBJS) : %.o: %.c
 	$(CC) $(CFLAGS_$@) $(USER_CFLAGS) -c -o $@ $<
-
-ethertap.o : $(ethertap-objs)
-
-tuntap.o : $(tuntap-objs)
-
-$(list-multi) : # This doesn't work, but should : '%.o : $(%-objs)'
-	$(LD) $(LD_RFLAG) -r -o $@ $($(patsubst %.o,%,$@)-objs)

arch/um/ptproxy/Makefile

-LIB = ptproxy.a
+LIB = lib.a
 
 OBJS = proxy.o ptrace.o sysdep.o wait.o
 

arch/um/sys-i386/Makefile

-O_TARGET = sys.o
 
 obj-y = bugs.o checksum.o extable.o fault.o ksyms.o ldt.o old-checksum.o \
 	ptrace.o ptrace_user.o semaphore.o sigcontext.o syscalls.o sysrq.o

arch/um/sys-ia64/Makefile

-OBJ = sys.o
+OBJ = built-in.o
 
 OBJS =
 

arch/um/sys-ppc/Makefile

-OBJ = sys.o
+OBJ = built-in.o
 
 .S.o:
 	$(CC) $(AFLAGS) -D__ASSEMBLY__ -D__UM_PPC__ -c $< -o $*.o