diff options
| -rw-r--r-- | Makefile.in | 14 | ||||
| -rw-r--r-- | ldso/ldso/Makefile.in | 4 | ||||
| -rw-r--r-- | ldso/libdl/Makefile.in | 4 | ||||
| -rw-r--r-- | libc/misc/elf/Makefile.in | 8 | ||||
| -rw-r--r-- | libc/misc/internals/Makefile.in | 9 | ||||
| -rw-r--r-- | libc/sysdeps/linux/Makefile.commonarch | 8 | ||||
| -rw-r--r-- | libc/sysdeps/linux/common/Makefile.in | 15 | ||||
| -rw-r--r-- | libc/sysdeps/linux/i386/Makefile.arch | 4 | ||||
| -rw-r--r-- | libc/termios/Makefile.in | 8 | ||||
| -rw-r--r-- | libc/unistd/Makefile.in | 8 | ||||
| -rw-r--r-- | libcrypt/Makefile.in | 4 | ||||
| -rw-r--r-- | libintl/Makefile.in | 4 | ||||
| -rw-r--r-- | libnsl/Makefile.in | 9 | ||||
| -rw-r--r-- | libpthread/linuxthreads.old/sysdeps/sh64/Makefile.arch | 4 | ||||
| -rw-r--r-- | libresolv/Makefile.in | 9 | ||||
| -rw-r--r-- | librt/Makefile.in | 6 | ||||
| -rw-r--r-- | libutil/Makefile.in | 4 | ||||
| -rw-r--r-- | test/Makefile | 1 | ||||
| -rw-r--r-- | test/locale/Makefile | 2 | ||||
| -rw-r--r-- | test/math/Makefile | 10 | ||||
| -rw-r--r-- | utils/Makefile.in | 19 |
21 files changed, 89 insertions, 65 deletions
diff --git a/Makefile.in b/Makefile.in index 70d55eff2..968021935 100644 --- a/Makefile.in +++ b/Makefile.in @@ -171,6 +171,15 @@ include/bits/sysnum.h: $(top_srcdir)extra/scripts/gen_bits_syscall_h.sh else \ mv -f $$tmp include/bits/sysnum.h; \ fi + @# Ugly linux specific hack.. + $(Q)if grep -q __NR_ $@; then true; else \ + rm -f $@; \ + echo "ERROR: Could not generate syscalls."; \ + echo "Make sure that you have proper kernel headers."; \ + echo "Your .config in KERNEL_HEADERS=\"\" was set to:"; \ + echo "${KERNEL_HEADERS}"; \ + exit 1; \ + fi $(LOCAL_INSTALL_PATH): $(Q)$(MAKE) PREFIX=$(shell pwd)/ RUNTIME_PREFIX=./ \ @@ -324,8 +333,11 @@ ifneq ($(UCLIBC_LINUX_SPECIFIC),y) $(RM) $(PREFIX)$(DEVEL_PREFIX)include/sys/sendfile.h $(RM) $(PREFIX)$(DEVEL_PREFIX)include/sys/fsuid.h $(RM) $(PREFIX)$(DEVEL_PREFIX)include/sys/signalfd.h + $(RM) $(PREFIX)$(DEVEL_PREFIX)include/bits/statfs.h + $(RM) $(PREFIX)$(DEVEL_PREFIX)include/sys/statfs.h $(RM) $(PREFIX)$(DEVEL_PREFIX)include/sys/swap.h $(RM) $(PREFIX)$(DEVEL_PREFIX)include/sys/sysctl.h + $(RM) $(PREFIX)$(DEVEL_PREFIX)include/sys/vfs.h endif ifneq ($(UCLIBC_SV4_DEPRECATED),y) # Remove ustat.h since deprecated SV4 support was disabled upon request @@ -421,7 +433,7 @@ ifeq ($(HAVE_SHARED),y) $(INSTALL) -d $(PREFIX)$(RUNTIME_PREFIX)lib $(INSTALL) -m 644 lib/lib*-$(VERSION).so \ $(PREFIX)$(RUNTIME_PREFIX)lib - cd lib && $(TAR) -cf - *.so.* | $(TAR) -xf - -C $(PREFIX)$(RUNTIME_PREFIX)lib + (cd lib && $(TAR) -cf - *.so.*) | $(TAR) -xf - -C $(PREFIX)$(RUNTIME_PREFIX)lib @if [ -x lib/$(UCLIBC_LDSO_NAME)-$(VERSION).so ] ; then \ set -e; \ $(SHELL_SET_X); \ diff --git a/ldso/ldso/Makefile.in b/ldso/ldso/Makefile.in index 3955004a4..e39ef84d5 100644 --- a/ldso/ldso/Makefile.in +++ b/ldso/ldso/Makefile.in @@ -1,6 +1,6 @@ # Makefile for uClibc # -# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org> +# Copyright (C) 2000-2008 Erik Andersen <andersen@uclibc.org> # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # @@ -65,4 +65,4 @@ $($(UCLIBC_LDSO_NAME)_OUT)/$(UCLIBC_LDSO_NAME)_so.a: $(ldso-y) $(do_ar) $(UCLIBC_LDSO_NAME)_clean: - $(RM) $($(UCLIBC_LDSO_NAME)_OUT)/*.{o,os,oS,a} $($(UCLIBC_LDSO_NAME)_OUT)/*/*.{o,os,oS} + $(do_rm) $(addprefix $($(UCLIBC_LDSO_NAME)_OUT)/,$(foreach e, o os oS a,$(foreach d, *. */*.,$(d)$(e)))) diff --git a/ldso/libdl/Makefile.in b/ldso/libdl/Makefile.in index 41cec858f..3d55e423a 100644 --- a/ldso/libdl/Makefile.in +++ b/ldso/libdl/Makefile.in @@ -1,6 +1,6 @@ # Makefile.in for uClibc # -# Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org> +# Copyright (C) 2000-2008 Erik Andersen <andersen@uclibc.org> # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # @@ -54,4 +54,4 @@ $(top_builddir)lib/libdl.a: $(libdl-a-y) $(do_ar) libdl_clean: - $(RM) $(libdl_OUT)/*.{o,os,a,oS} + $(do_rm) $(addprefix $(libdl_OUT)/*., o os oS a) diff --git a/libc/misc/elf/Makefile.in b/libc/misc/elf/Makefile.in index b9cab8eb3..c97d29929 100644 --- a/libc/misc/elf/Makefile.in +++ b/libc/misc/elf/Makefile.in @@ -10,10 +10,10 @@ CFLAGS-dl-iterate-phdr.c=-D_GNU_SOURCE MISC_ELF_OUT:=$(top_builddir)libc/misc/elf MISC_ELF_OBJ:=$(patsubst %.c,$(MISC_ELF_OUT)/%.o,$(libc_a_CSRC)) -libc-static-y += $(MISC_ELF_OBJ) +libc-static-y += $(MISC_ELF_OBJ) libc-shared-y += $(MISC_ELF_OUT)/dl-iterate-phdr.oS -objclean-y+= misc_elf_objclean +objclean-y+= misc_elf_clean -misc_elf_objclean: - $(RM) $(MISC_ELF_OUT)/*.{o,os,oS} +misc_elf_clean: + $(do_rm) $(addprefix $(MISC_ELF_OUT)/*., o os oS) diff --git a/libc/misc/internals/Makefile.in b/libc/misc/internals/Makefile.in index 11cc7efdb..2ca6cd45d 100644 --- a/libc/misc/internals/Makefile.in +++ b/libc/misc/internals/Makefile.in @@ -1,6 +1,6 @@ # Makefile for uClibc # -# Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org> +# Copyright (C) 2000-2008 Erik Andersen <andersen@uclibc.org> # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # @@ -25,7 +25,8 @@ libc-static-$(UCLIBC_FORMAT_SHARED_FLAT) += \ $(MISC_INTERNALS_OUT)/shared_flat_add_library.o libc-nomulti-y += $(MISC_INTERNALS_OUT)/__uClibc_main.o \ $(MISC_INTERNALS_OUT)/errno.o -objclean-y += misc_internals_objclean -misc_internals_objclean: - $(RM) $(MISC_INTERNALS_OUT)/*.{o,os,oS} +objclean-y += misc_internals_clean + +misc_internals_clean: + $(do_rm) $(addprefix $(MISC_INTERNALS_OUT)/*., o os oS) diff --git a/libc/sysdeps/linux/Makefile.commonarch b/libc/sysdeps/linux/Makefile.commonarch index 1c616ec4a..2dad073ad 100644 --- a/libc/sysdeps/linux/Makefile.commonarch +++ b/libc/sysdeps/linux/Makefile.commonarch @@ -1,6 +1,6 @@ # Makefile template to be included by sysdeps/linux/<ARCH>/Makefile.arch # -# Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org> +# Copyright (C) 2000-2008 Erik Andersen <andersen@uclibc.org> # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # @@ -18,13 +18,13 @@ ARCH_OBJS := $(ARCH_COBJ) $(ARCH_SOBJ) crt-y := FORCE libc-y += $(ARCH_OBJS) libc-nomulti-y += $(ARCH_SOBJ) -objclean-y += arch_objclean +objclean-y += arch_clean CFLAGS-crti.S+=$(PICFLAG) CFLAGS-crtn.S+=$(PICFLAG) -arch_objclean: - $(RM) $(ARCH_OUT)/*.{o,os} $(CTOR_TARGETS) $(CRTS) +arch_clean: + $(do_rm) $(addprefix $(ARCH_OUT)/*., o os oS) $(CTOR_TARGETS) $(CRTS) ifneq ($(ARCH_HEADERS),) diff --git a/libc/sysdeps/linux/common/Makefile.in b/libc/sysdeps/linux/common/Makefile.in index 9f18daa31..0449622d5 100644 --- a/libc/sysdeps/linux/common/Makefile.in +++ b/libc/sysdeps/linux/common/Makefile.in @@ -1,6 +1,6 @@ # Makefile for uClibc # -# Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org> +# Copyright (C) 2000-2008 Erik Andersen <andersen@uclibc.org> # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # @@ -25,8 +25,7 @@ CSRC := $(filter-out ssp.c,$(CSRC)) endif ifneq ($(UCLIBC_LINUX_MODULE_24),y) -CSRC := $(filter-out create_module.c delete_module.c init_module.c \ - query_module.c get_kernel_syms.c,$(CSRC)) +CSRC := $(filter-out create_module.c query_module.c get_kernel_syms.c,$(CSRC)) endif ifneq ($(UCLIBC_LINUX_SPECIFIC),y) @@ -35,8 +34,8 @@ CSRC := $(filter-out inotify.c ioperm.c iopl.c madvise.c \ modify_ldt.c personality.c prctl.c readahead.c reboot.c \ remap_file_pages.c sched_getaffinity.c sched_setaffinity.c \ sendfile64.c sendfile.c setfsgid.c setfsuid.c setresuid.c \ - splice.c vmsplice.c tee.c swapoff.c swapon.c sysctl.c sysinfo.c \ - uselib.c vhangup.c,$(CSRC)) + splice.c vmsplice.c tee.c signalfd.c swapoff.c swapon.c \ + sync_file_range.c sysctl.c sysinfo.c uselib.c vhangup.c,$(CSRC)) endif ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y) @@ -110,7 +109,7 @@ libc-nomulti-y += $(COMMON_OUT)/__syscall_rt_sigaction.o \ $(COMMON_OUT)/stat.o libc-nomulti-$(UCLIBC_HAS_SSP) += $(COMMON_OUT)/ssp.o -objclean-y += common_objclean +objclean-y += common_clean -common_objclean: - $(RM) $(COMMON_OUT)/*.{o,os,oS} +common_clean: + $(do_rm) $(addprefix $(COMMON_OUT)/*., o os oS) diff --git a/libc/sysdeps/linux/i386/Makefile.arch b/libc/sysdeps/linux/i386/Makefile.arch index abd267445..3d338a03a 100644 --- a/libc/sysdeps/linux/i386/Makefile.arch +++ b/libc/sysdeps/linux/i386/Makefile.arch @@ -8,7 +8,7 @@ CSRC := brk.c sigaction.c __syscall_error.c SSRC := \ - __longjmp.S vfork.S clone.S setjmp.S bsd-setjmp.S \ - bsd-_setjmp.S syscall.S mmap.S mmap64.S + __longjmp.S vfork.S clone.S setjmp.S bsd-setjmp.S bsd-_setjmp.S \ + sync_file_range.S syscall.S mmap.S mmap64.S posix_fadvise64.S include $(top_srcdir)libc/sysdeps/linux/Makefile.commonarch diff --git a/libc/termios/Makefile.in b/libc/termios/Makefile.in index 99b1a729f..c77ee60e4 100644 --- a/libc/termios/Makefile.in +++ b/libc/termios/Makefile.in @@ -1,6 +1,6 @@ # Makefile for uClibc # -# Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org> +# Copyright (C) 2000-2008 Erik Andersen <andersen@uclibc.org> # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # @@ -13,7 +13,7 @@ TERMIOS_OBJ := $(patsubst $(TERMIOS_DIR)/%.c,$(TERMIOS_OUT)/%.o,$(TERMIOS_SRC)) libc-y += $(TERMIOS_OBJ) -objclean-y += termios_objclean +objclean-y += termios_clean -termios_objclean: - $(RM) $(TERMIOS_OUT)/*.{o,os} +termios_clean: + $(do_rm) $(addprefix $(TERMIOS_OUT)/*., o os) diff --git a/libc/unistd/Makefile.in b/libc/unistd/Makefile.in index 8095aa641..b447a85e1 100644 --- a/libc/unistd/Makefile.in +++ b/libc/unistd/Makefile.in @@ -1,6 +1,6 @@ # Makefile for uClibc # -# Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org> +# Copyright (C) 2000-2008 Erik Andersen <andersen@uclibc.org> # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # @@ -42,7 +42,7 @@ UNISTD_OBJ := $(patsubst %.c,$(UNISTD_OUT)/%.o,$(CSRC)) libc-y += $(UNISTD_OBJ) -objclean-y += unistd_objclean +objclean-y += unistd_clean -unistd_objclean: - $(RM) $(UNISTD_OUT)/*.{o,os} +unistd_clean: + $(do_rm) $(addprefix $(UNISTD_OUT)/*., o os) diff --git a/libcrypt/Makefile.in b/libcrypt/Makefile.in index a74e4ec0c..f394c413e 100644 --- a/libcrypt/Makefile.in +++ b/libcrypt/Makefile.in @@ -1,6 +1,6 @@ # Makefile for uClibc # -# Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org> +# Copyright (C) 2000-2008 Erik Andersen <andersen@uclibc.org> # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # @@ -65,4 +65,4 @@ $(top_builddir)lib/libcrypt.a: $(libcrypt-a-y) $(do_ar) libcrypt_clean: - $(RM) $(libcrypt_OUT)/*.{o,os,oS,a} + $(do_rm) $(addprefix $(libcrypt_OUT)/*., o os oS a) diff --git a/libintl/Makefile.in b/libintl/Makefile.in index 238ad4466..d4da42c2a 100644 --- a/libintl/Makefile.in +++ b/libintl/Makefile.in @@ -1,6 +1,6 @@ # Makefile for uClibc # -# Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org> +# Copyright (C) 2000-2008 Erik Andersen <andersen@uclibc.org> # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # @@ -71,4 +71,4 @@ $(libintl_MOBJ:.o=.os): $(libintl_MSRC) $(compile.m) libintl_clean: - $(RM) $(libintl_OUT)/*.{o,os,a} + $(do_rm) $(addprefix $(libintl_OUT)/*., o os oS a) diff --git a/libnsl/Makefile.in b/libnsl/Makefile.in index a66b90c6f..0995b3c4f 100644 --- a/libnsl/Makefile.in +++ b/libnsl/Makefile.in @@ -1,6 +1,6 @@ # Makefile for uClibc # -# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org> +# Copyright (C) 2000-2008 Erik Andersen <andersen@uclibc.org> # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # @@ -8,6 +8,11 @@ CFLAGS-libnsl := -DNOT_IN_libc -DIS_IN_libnsl $(SSP_ALL_CFLAGS) LDFLAGS-libnsl.so := $(LDFLAGS) +ifdef ASNEEDED +ifeq ($(UCLIBC_HAS_SSP),y) +LDFLAGS-libnsl.so += -Wl,--no-as-needed -lc -Wl,--as-needed +endif +endif LIBS-libnsl.so := $(LIBS) @@ -47,4 +52,4 @@ $(top_builddir)lib/libnsl.a: $(libnsl-a-y) $(do_ar) libnsl_clean: - $(RM) $(libnsl_OUT)/*.{o,os,a} + $(do_rm) $(addprefix $(libnsl_OUT)/*., o os a) diff --git a/libpthread/linuxthreads.old/sysdeps/sh64/Makefile.arch b/libpthread/linuxthreads.old/sysdeps/sh64/Makefile.arch index bf57e803c..ce00f4d8e 100644 --- a/libpthread/linuxthreads.old/sysdeps/sh64/Makefile.arch +++ b/libpthread/linuxthreads.old/sysdeps/sh64/Makefile.arch @@ -17,7 +17,7 @@ libpthread-so-y+=$(libpthread_ARCH_OBJ:.o=.os) libpthread-multi-y+=$(libpthread_ARCH_SRC) -objclean-y+=libpthread_arch_objclean +objclean-y+=libpthread_arch_clean # We need to build as SHcompact for tas.. $(libpthread_ARCH_OBJ): %.o : %.c @@ -26,5 +26,5 @@ $(libpthread_ARCH_OBJ): %.o : %.c $(libpthread_ARCH_OBJ:.o=.os): %.os : %.c $(compile.c:32media=compact) -libpthread_arch_objclean: +libpthread_arch_clean: $(do_rm) $(addprefix $(libpthread_ARCH_OUT)/*., o os) diff --git a/libresolv/Makefile.in b/libresolv/Makefile.in index cfcb9d78b..4b4d781c1 100644 --- a/libresolv/Makefile.in +++ b/libresolv/Makefile.in @@ -1,6 +1,6 @@ # Makefile for uClibc # -# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org> +# Copyright (C) 2000-2008 Erik Andersen <andersen@uclibc.org> # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # @@ -8,6 +8,11 @@ CFLAGS-libresolv := -DNOT_IN_libc -DIS_IN_libresolv $(SSP_ALL_CFLAGS) LDFLAGS-libresolv.so := $(LDFLAGS) +ifdef ASNEEDED +ifeq ($(UCLIBC_HAS_SSP),y) +LDFLAGS-libresolv.so += -Wl,--no-as-needed -lc -Wl,--as-needed +endif +endif LIBS-libresolv.so := $(LIBS) @@ -47,4 +52,4 @@ $(top_builddir)lib/libresolv.a: $(libresolv-a-y) $(do_ar) libresolv_clean: - $(RM) $(libresolv_OUT)/*.{o,os,a} + $(do_rm) $(addprefix $(libresolv_OUT)/*., o os a) diff --git a/librt/Makefile.in b/librt/Makefile.in index 5234b680f..e37e68925 100644 --- a/librt/Makefile.in +++ b/librt/Makefile.in @@ -1,6 +1,6 @@ # Makefile for uClibc # -# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org> +# Copyright (C) 2000-2008 Erik Andersen <andersen@uclibc.org> # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # @@ -21,6 +21,7 @@ librt_FULL_NAME := librt-$(VERSION).so librt_DIR := $(top_srcdir)librt librt_OUT := $(top_builddir)librt +ifeq ($(UCLIBC_HAS_REALTIME),y) ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y) librt_CSRC := $(filter-out mq_notify.c timer_create.c timer_delete.c \ timer_getoverr.c timer_gettime.c timer_settime.c, \ @@ -46,6 +47,7 @@ librt-so-y += $(librt_OBJ:.o=.oS) lib-a-y += $(top_builddir)lib/librt.a lib-so-y += $(top_builddir)lib/librt.so +endif ifeq ($(DOPIC)$(UCLIBC_HAS_THREADS_NATIVE),yn) @@ -67,4 +69,4 @@ $(top_builddir)lib/librt.a: $(librt-a-y) objclean-y += librt_clean librt_clean: - $(RM) $(librt_OUT)/*.{o,os,oS,a} + $(do_rm) $(addprefix $(librt_OUT)/*., o os a) diff --git a/libutil/Makefile.in b/libutil/Makefile.in index ef3169906..67d973859 100644 --- a/libutil/Makefile.in +++ b/libutil/Makefile.in @@ -1,6 +1,6 @@ # Makefile for uClibc # -# Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org> +# Copyright (C) 2000-2008 Erik Andersen <andersen@uclibc.org> # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # @@ -63,4 +63,4 @@ $(top_builddir)lib/libutil.a: $(libutil-a-y) $(do_ar) libutil_clean: - $(RM) $(libutil_OUT)/*.{o,os,oS,a} + $(do_rm) $(addprefix $(libutil_OUT)/*., o os oS a) diff --git a/test/Makefile b/test/Makefile index dfc42ed75..f66219ad8 100644 --- a/test/Makefile +++ b/test/Makefile @@ -43,7 +43,6 @@ ifeq ($(HAS_NO_THREADS),y) endif DIRS := $(filter-out math,$(DIRS)) - test check all: run run: compile subdirs_run diff --git a/test/locale/Makefile b/test/locale/Makefile index 0ab07f7aa..7e408b8cf 100644 --- a/test/locale/Makefile +++ b/test/locale/Makefile @@ -28,4 +28,4 @@ OPTS_dump-ctype = C OPTS_tst-ctype = < tst-ctype-de_DE.ISO-8859-1.in OPTS_tst-langinfo = < tst-langinfo.input -EXTRA_CLEAN := C +EXTRA_DIRS := C diff --git a/test/math/Makefile b/test/math/Makefile index e65f1700e..09f5425a5 100644 --- a/test/math/Makefile +++ b/test/math/Makefile @@ -1,10 +1,10 @@ # uClibc math tests # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. -TESTS := basic-test rint tst-definitions test-fpucw -# test-double test-idouble -# test-float test-ifloat -# test-ldouble test-ildouble +TESTS := basic-test rint tst-definitions test-fpucw test-float test-ifloat test-double test-idouble +ifeq ($(strip $(UCLIBC_HAS_LONG_DOUBLE_MATH)),y) +TESTS += test-ldouble test-ildouble +endif include ../Test.mak @@ -15,7 +15,7 @@ DODIFF_rint := 1 ifeq ($(TARGET_ARCH),sh) CFLAGS_basic-test := -mieee endif -EXTRA_CFLAGS := -DNO_LONG_DOUBLE -fno-builtin +EXTRA_CFLAGS := -fno-builtin EXTRA_LDFLAGS := -lm PERL := /usr/bin/perl diff --git a/utils/Makefile.in b/utils/Makefile.in index 1ac3e7c37..26ed70058 100644 --- a/utils/Makefile.in +++ b/utils/Makefile.in @@ -1,6 +1,6 @@ # Makefile for uClibc # -# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org> +# Copyright (C) 2000-2008 Erik Andersen <andersen@uclibc.org> # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # @@ -92,19 +92,20 @@ $(hostutils_OBJ): $(utils_OUT)/%.host : $(utils_DIR)/%.c install-y += utils_install utils_install: utils - $(INSTALL) -d $(PREFIX)$(RUNTIME_PREFIX)usr/bin - #$(INSTALL) -m 755 $(utils_OUT)/readelf $(PREFIX)$(RUNTIME_PREFIX)usr/bin/readelf + #$(Q)$(INSTALL) -D -m 755 $(utils_OUT)/readelf $(PREFIX)$(RUNTIME_PREFIX)usr/bin/readelf ifeq ($(HAVE_SHARED),y) - $(INSTALL) -d $(PREFIX)$(RUNTIME_PREFIX)sbin - $(INSTALL) -m 755 $(utils_OUT)/ldd $(PREFIX)$(RUNTIME_PREFIX)usr/bin/ldd - $(INSTALL) -m 755 $(utils_OUT)/ldconfig $(PREFIX)$(RUNTIME_PREFIX)sbin/ldconfig + $(Q)$(INSTALL) -D -m 755 $(utils_OUT)/ldd $(PREFIX)$(RUNTIME_PREFIX)usr/bin/ldd + $(Q)$(INSTALL) -D -m 755 $(utils_OUT)/ldconfig $(PREFIX)$(RUNTIME_PREFIX)sbin/ldconfig endif ifeq ($(UCLIBC_HAS_LOCALE),y) - $(INSTALL) -m 755 $(utils_OUT)/iconv $(PREFIX)$(RUNTIME_PREFIX)usr/bin/iconv - $(INSTALL) -m 755 $(utils_OUT)/locale $(PREFIX)$(RUNTIME_PREFIX)usr/bin/locale + $(Q)$(INSTALL) -D -m 755 $(utils_OUT)/iconv $(PREFIX)$(RUNTIME_PREFIX)usr/bin/iconv + $(Q)$(INSTALL) -m 755 $(utils_OUT)/locale $(PREFIX)$(RUNTIME_PREFIX)usr/bin/locale endif objclean-y += utils_clean utils_clean: - $(RM) $(utils_OUT)/{ldconfig,ldd,readelf,iconv,locale,*.host} + $(do_rm) $(addprefix $(utils_OUT)/, ldconfig ldd readelf iconv locale *.host) + # This is a hack.. + $(Q)$(RM) $(utils_OUT)/.*.dep + |
