diff options
| author | Greg Ungerer <gerg@uclinux.org> | 2011-03-28 15:58:49 +1000 |
|---|---|---|
| committer | Greg Ungerer <gerg@uclinux.org> | 2011-05-24 10:03:49 +1000 |
| commit | b82ed87e67b081e55608b86b3e6f6f9036cedbd3 (patch) | |
| tree | 68aa705f17508a5257f3ed72a146abc628f92387 | |
| parent | 98d655a68f864588ff21ae372ddd3563a6699f1c (diff) | |
| download | linux-b82ed87e67b081e55608b86b3e6f6f9036cedbd3.tar.bz2 | |
m68k: merge mmu and non-mmu versions of lib/Makefile
We can easily support the slight differences in libs needed by the
mmu and non-mmu builds in a single Makefile, so merge them back into
a single file again.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
| -rw-r--r-- | arch/m68k/lib/Makefile | 13 | ||||
| -rw-r--r-- | arch/m68k/lib/Makefile_mm | 6 | ||||
| -rw-r--r-- | arch/m68k/lib/Makefile_no | 7 |
3 files changed, 11 insertions, 15 deletions
diff --git a/arch/m68k/lib/Makefile b/arch/m68k/lib/Makefile index 1f95881d8437..3d85fb6e6d3b 100644 --- a/arch/m68k/lib/Makefile +++ b/arch/m68k/lib/Makefile @@ -1,5 +1,14 @@ + +# +# Makefile for m68k-specific library files.. +# + +lib-y := ashldi3.o ashrdi3.o lshrdi3.o muldi3.o checksum.o + ifdef CONFIG_MMU -include arch/m68k/lib/Makefile_mm +lib-y += string.o uaccess.o else -include arch/m68k/lib/Makefile_no +lib-y += mulsi3.o divsi3.o udivsi3.o modsi3.o umodsi3.o \ + memcpy.o memmove.o memset.o delay.o endif + diff --git a/arch/m68k/lib/Makefile_mm b/arch/m68k/lib/Makefile_mm deleted file mode 100644 index af9abf8d9d98..000000000000 --- a/arch/m68k/lib/Makefile_mm +++ /dev/null @@ -1,6 +0,0 @@ -# -# Makefile for m68k-specific library files.. -# - -lib-y := ashldi3.o ashrdi3.o lshrdi3.o muldi3.o \ - checksum.o string.o uaccess.o diff --git a/arch/m68k/lib/Makefile_no b/arch/m68k/lib/Makefile_no deleted file mode 100644 index 32d852e586d7..000000000000 --- a/arch/m68k/lib/Makefile_no +++ /dev/null @@ -1,7 +0,0 @@ -# -# Makefile for m68knommu specific library files.. -# - -lib-y := ashldi3.o ashrdi3.o lshrdi3.o \ - muldi3.o mulsi3.o divsi3.o udivsi3.o modsi3.o umodsi3.o \ - checksum.o memcpy.o memmove.o memset.o delay.o |