Commit 8c04ef75 authored by Jeff Dike's avatar Jeff Dike

Fixed the Makefiles so that the ptproxy move from arch/um/ptproxy

to arch/um/kernel/tt/ptproxy works.
parent 42274964
......@@ -31,8 +31,6 @@ core-y += $(ARCH_DIR)/kernel/ \
$(ARCH_DIR)/drivers/ \
$(ARCH_DIR)/sys-$(SUBARCH)/
core-$(CONFIG_PT_PROXY) += $(ARCH_DIR)/ptproxy/
ARCH_INCLUDE = $(TOPDIR)/$(ARCH_DIR)/include
# -Derrno=kernel_errno - This turns all kernel references to errno into
......
......@@ -18,14 +18,14 @@ obj-$(CONFIG_GPROF) += gprof_syms.o
obj-$(CONFIG_GCOV) += gmon_syms.o
obj-$(CONFIG_TTY_LOG) += tty_log.o
subdir-$(CONFIG_PTPROXY) += tt
obj-$(CONFIG_PT_PROXY) += tt/
user-objs-$(CONFIG_TTY_LOG) += tty_log.o
# 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)) $(user-objs-y) config.o helper.o
USER_OBJS := $(filter %_user.o,$(obj-y)) $(user-objs-y) config.o helper.o \
process.o tempfile.o time.o tty_log.o umid.o user_util.o user_syms.o
USER_OBJS := $(foreach file,$(USER_OBJS),arch/um/kernel/$(file))
......
......@@ -3,7 +3,7 @@
# Licensed under the GPL
#
subdir-$(CONFIG_PT_PROXY) += ptproxy
obj-$(CONFIG_PT_PROXY) += ptproxy/
include $(TOPDIR)/Rules.make
#
# Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
# Licensed under the GPL
#
obj-y = proxy.o ptrace.o sysdep.o wait.o
USER_OBJS := $(foreach file,$(obj-y),arch/um/ptproxy/$(file))
USER_OBJS := $(foreach file,$(obj-y),$(src)/$(file))
include $(TOPDIR)/Rules.make
$(USER_OBJS) : %.o: %.c
$(CC) $(CFLAGS_$@) $(USER_CFLAGS) -c -o $@ $<
$(CC) $(CFLAGS_$(notdir $@)) $(USER_CFLAGS) -c -o $@ $<
clean:
rm -f *.o core child ptproxy
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment