diff options
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | Makerules | 2 | ||||
| -rw-r--r-- | ldso/ldso/Makefile.in | 4 | ||||
| -rw-r--r-- | ldso/libdl/Makefile.in | 4 | ||||
| -rw-r--r-- | libcrypt/Makefile.in | 2 | ||||
| -rw-r--r-- | libintl/Makefile.in | 2 | ||||
| -rw-r--r-- | libm/Makefile.in | 7 | ||||
| -rw-r--r-- | libnsl/Makefile.in | 5 | ||||
| -rw-r--r-- | libpthread/linuxthreads/Makefile.in | 4 | ||||
| -rw-r--r-- | libpthread/linuxthreads/sysdeps/sh64/Makefile.in | 2 | ||||
| -rw-r--r-- | libpthread/linuxthreads_db/Makefile.in | 4 | ||||
| -rw-r--r-- | libresolv/Makefile.in | 5 | ||||
| -rw-r--r-- | libutil/Makefile.in | 2 |
13 files changed, 18 insertions, 27 deletions
diff --git a/Makefile.in b/Makefile.in index 95479231d..bb6b68bcc 100644 --- a/Makefile.in +++ b/Makefile.in @@ -341,7 +341,7 @@ defconfig: extra/config/conf clean: @$(RM) -r lib include/bits - $(RM) lib*/*.a ldso/*/*.a + $(RM) lib*/*.a ldso/*/*.a libpthread/*/*.a $(RM) libc/misc/locale/locale_data.c $(RM) libc/misc/internals/interp.c $(RM) include/fpu_control.h @@ -189,7 +189,7 @@ else endif endif -ifeq ($(DOMULTI),y) +ifneq ($(DOMULTI),n) $($(LIB_NAME)_OUT)/$(LIB_NAME)_so.a: $($(LIB_NAME)_OUT)/$(LIB_NAME).os $($(LIB_NAME)-nomulti-y:.o=.os) $(RM) $@ diff --git a/ldso/ldso/Makefile.in b/ldso/ldso/Makefile.in index 2ba7e2f71..30a6c4ec2 100644 --- a/ldso/ldso/Makefile.in +++ b/ldso/ldso/Makefile.in @@ -39,7 +39,7 @@ ifeq ($(SUPPORT_LD_DEBUG),y) LDFLAGS:=$(LDFLAGS_NOSTRIP) endif -# useless, only 1 source file +# can't combine .c w/ .S DOMULTI=n LIB_NAME:=ld-uClibc @@ -60,7 +60,7 @@ EXTRA_LINK_LIBS:=$(LIBGCC) # $(LDADD_LIBFLOAT) ld-uClibc-so-$(HAVE_SHARED):=$(ld-uClibc_OBJS:.o=.os) -#ld-uClibc-multi-$(HAVE_SHARED):=$(ld-uClibc_SRC) +ld-uClibc-multi-$(HAVE_SHARED):=$(ld-uClibc_SRC) $(ld-uClibc_SSRC) objclean-y+=ld-uClibc_clean ld-uClibc_arch_clean diff --git a/ldso/libdl/Makefile.in b/ldso/libdl/Makefile.in index 24a53422e..1e758e148 100644 --- a/ldso/libdl/Makefile.in +++ b/ldso/libdl/Makefile.in @@ -21,7 +21,7 @@ ifeq ($(TARGET_ARCH),mips) CFLAGS:=$(CFLAGS:-O0=-O1) endif -# useless, only 1 source file +# we need special .oS file created, do not enable this DOMULTI=n LIB_NAME:=libdl @@ -46,7 +46,7 @@ libdl-a-$(HAVE_SHARED):=$(libdl_OBJ) $(resolve) libdl-a-pic-$(HAVE_SHARED):=$(libdl_OBJ:.o=.os) $(resolve:.o=.os) libdl-so-$(HAVE_SHARED):=$(libdl_OBJ:.o=.oS) -# we enable this although no use of multi, else libdl.o gets empty sources +# do not disable this libdl-multi-$(HAVE_SHARED):=$(libdl_SRC) objclean-y+=libdl_clean libdl_extra_clean diff --git a/libcrypt/Makefile.in b/libcrypt/Makefile.in index 5394a0538..4ab093b19 100644 --- a/libcrypt/Makefile.in +++ b/libcrypt/Makefile.in @@ -8,8 +8,6 @@ CFLAGS+=$(SSP_ALL_CFLAGS) -#DOMULTI=y - LIB_NAME:=libcrypt libcrypt_DIR:=$(top_srcdir)libcrypt diff --git a/libintl/Makefile.in b/libintl/Makefile.in index 8f5a75adc..1b901569e 100644 --- a/libintl/Makefile.in +++ b/libintl/Makefile.in @@ -8,8 +8,6 @@ CFLAGS+=$(SSP_ALL_CFLAGS) -#DOMULTI=y - LIB_NAME:=libintl MOBJ:=gettext.o ngettext.o dgettext.o dcgettext.o dngettext.o dcngettext.o \ diff --git a/libm/Makefile.in b/libm/Makefile.in index a61ceb2d2..baef02a30 100644 --- a/libm/Makefile.in +++ b/libm/Makefile.in @@ -24,7 +24,7 @@ CFLAGS+=$(SSP_ALL_CFLAGS) CFLAGS+=-D_IEEE_LIBM -D_ISOC99_SOURCE -D_SVID_SOURCE -#DOMULTI=y +DOMULTI=n LIB_NAME:=libm @@ -110,8 +110,9 @@ libm-a-pic-$(UCLIBC_HAS_FLOATS)+=$(libm_OBJS:.o=.os) libm-so-$(UCLIBC_HAS_FLOATS)+=$(libm_OBJS:.o=.os) CFLAGS-multi-$(UCLIBC_HAS_FLOATS)+=$(libm_DEF) -libm-multi-$(UCLIBC_HAS_FLOATS)+=$(libm_MSRC) -libm-nomulti-$(UCLIBC_HAS_FLOATS)+=$(libm_OBJ) +libm-multi-$(UCLIBC_HAS_FLOATS)+=$(libm_SRC) $(libm_MSRC) +#libm-multi-$(UCLIBC_HAS_FLOATS)+=$(libm_MSRC) +#libm-nomulti-$(UCLIBC_HAS_FLOATS)+=$(libm_OBJ) objclean-y+=libm_clean diff --git a/libnsl/Makefile.in b/libnsl/Makefile.in index 076eb49dd..ab3745382 100644 --- a/libnsl/Makefile.in +++ b/libnsl/Makefile.in @@ -7,9 +7,6 @@ CFLAGS+=$(SSP_ALL_CFLAGS) -# useless, only 1 source file -DOMULTI=n - LIB_NAME:=libnsl libnsl_DIR:=$(top_srcdir)libnsl @@ -22,7 +19,7 @@ libnsl-a-y:=$(libnsl_OBJ) libnsl-a-pic-y:=$(libnsl_OBJ:.o=.os) libnsl-so-y:=$(libnsl_OBJ:.o=.os) -#libnsl-multi-y:=$(libnsl_SRC) +libnsl-multi-y:=$(libnsl_SRC) objclean-y+=libnsl_clean diff --git a/libpthread/linuxthreads/Makefile.in b/libpthread/linuxthreads/Makefile.in index 026fd1452..b0537bb15 100644 --- a/libpthread/linuxthreads/Makefile.in +++ b/libpthread/linuxthreads/Makefile.in @@ -1,4 +1,4 @@ -# Makefile for uClibc's pthread library +# Makefile for uClibc # # Copyright (C) 2003 Paul Mundt <lethal@linux-sh.org> # Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org> @@ -51,6 +51,8 @@ libpthread-so-$(UCLIBC_HAS_THREADS)+=$(libpthread_OBJ:.o=.os) libpthread-multi-$(UCLIBC_HAS_THREADS)+=$(libpthread_SRC) +objclean-y+=libpthread_clean + lib-a-$(UCLIBC_HAS_THREADS)+=$(top_builddir)lib/libpthread.a lib-a-pic-$(UCLIBC_HAS_THREADS)+=$(top_builddir)lib/libpthread.a lib-so-$(UCLIBC_HAS_THREADS)+=$(top_builddir)lib/libpthread.so diff --git a/libpthread/linuxthreads/sysdeps/sh64/Makefile.in b/libpthread/linuxthreads/sysdeps/sh64/Makefile.in index 5aa54a64f..46ceeb1f8 100644 --- a/libpthread/linuxthreads/sysdeps/sh64/Makefile.in +++ b/libpthread/linuxthreads/sysdeps/sh64/Makefile.in @@ -1,4 +1,4 @@ -# Makefile for uClibc's sh64 pthread backend +# Makefile for uClibc # # Copyright (C) 2003 Paul Mundt <lethal@linux-sh.org> # Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org> diff --git a/libpthread/linuxthreads_db/Makefile.in b/libpthread/linuxthreads_db/Makefile.in index 18558089f..559a4ba91 100644 --- a/libpthread/linuxthreads_db/Makefile.in +++ b/libpthread/linuxthreads_db/Makefile.in @@ -18,8 +18,6 @@ ifeq ($(PTHREADS_DEBUG_SUPPORT),y) STRIP_FLAGS:=-X --strip-debug -R .note -R .comment endif -#DOMULTI=y - LIB_NAME:=libthread_db libthread_db_FULL_NAME:=$(LIB_NAME)-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so @@ -38,6 +36,8 @@ libthread_db-so-$(PTHREADS_DEBUG_SUPPORT)+=$(libthread_db_OBJ:.o=.os) libthread_db-multi-$(PTHREADS_DEBUG_SUPPORT)+=$(libthread_db_SRC) +objclean-y+=libthread_db_clean + lib-a-$(PTHREADS_DEBUG_SUPPORT)+=$(top_builddir)lib/libthread_db.a lib-a-pic-$(PTHREADS_DEBUG_SUPPORT)+=$(top_builddir)lib/libthread_db.a lib-so-$(PTHREADS_DEBUG_SUPPORT)+=$(top_builddir)lib/libthread_db.so diff --git a/libresolv/Makefile.in b/libresolv/Makefile.in index 8966f95a3..644c96e86 100644 --- a/libresolv/Makefile.in +++ b/libresolv/Makefile.in @@ -7,9 +7,6 @@ CFLAGS+=$(SSP_ALL_CFLAGS) -# useless, only 1 source file -DOMULTI=n - LIB_NAME:=libresolv libresolv_DIR:=$(top_srcdir)libresolv @@ -22,7 +19,7 @@ libresolv-a-y:=$(libresolv_OBJ) libresolv-a-pic-y:=$(libresolv_OBJ:.o=.os) libresolv-so-y:=$(libresolv_OBJ:.o=.os) -#libresolv-multi-y:=$(libresolv_SRC) +libresolv-multi-y:=$(libresolv_SRC) objclean-y+=libresolv_clean diff --git a/libutil/Makefile.in b/libutil/Makefile.in index 6f6b03ea1..32010b99c 100644 --- a/libutil/Makefile.in +++ b/libutil/Makefile.in @@ -7,8 +7,6 @@ CFLAGS+=$(SSP_ALL_CFLAGS) -#DOMULTI=y - LIB_NAME:=libutil libutil_DIR:=$(top_srcdir)libutil |