diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-21 22:00:56 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-21 22:00:56 +0000 |
| commit | 168660f24dfc46c2702acbe4701a446f42a59578 (patch) | |
| tree | f431368afbf6b1b71809cf3fd904d800ea126f4d /arch/arm/Makefile | |
| parent | 6420f767924fa73b0ea267864d96820815f4ba5a (diff) | |
Merge with Linux 2.4.0-test5-pre3.
Diffstat (limited to 'arch/arm/Makefile')
| -rw-r--r-- | arch/arm/Makefile | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 9f2e5347a..5bd7af915 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -114,12 +114,7 @@ LIBGCC := $(shell $(CC) $(CFLAGS) --print-libgcc-file-name) export LIBGCC MACHINE PROCESSOR TEXTADDR GZFLAGS -ifeq ($(CONFIG_ARCH_A5K),y) -MACHINE = a5k -ARCHDIR = arc -endif - -ifeq ($(CONFIG_ARCH_ARC),y) +ifeq ($(CONFIG_ARCH_ARCA5K),y) MACHINE = arc ARCHDIR = arc endif @@ -197,7 +192,8 @@ MAKEBOOT = $(MAKE) -C arch/$(ARCH)/boot # The following is a hack to get 'constants.h' up # to date before starting compilation -CONSTANTS := constants + +$(patsubst %, _dir_%, $(SUBDIRS)) : constants constants: $(TOPDIR)/include/asm-arm/proc-fns.h dummy @$(MAKE) -C arch/arm/lib constants.h |