summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter S. Mazinger <ps.m@gmx.net>2005-10-29 10:16:07 +0000
committerPeter S. Mazinger <ps.m@gmx.net>2005-10-29 10:16:07 +0000
commite6aa37afc9c281a04f40250b8fcd35302064a087 (patch)
tree5dd83379964b1d75792ace567fd56915168d182c
parenta4753b1da2c2a1f7de691619a52e2934d2c248ac (diff)
Replace all Makefiles for new build infrastucture
-rw-r--r--Makefile84
-rw-r--r--ldso/Makefile59
-rw-r--r--ldso/ldso/Makefile100
-rw-r--r--ldso/libdl/Makefile96
-rw-r--r--libc/Makefile121
-rw-r--r--libc/inet/Makefile98
-rw-r--r--libc/inet/rpc/Makefile69
-rw-r--r--libc/misc/Makefile70
-rw-r--r--libc/misc/assert/Makefile43
-rw-r--r--libc/misc/ctype/Makefile66
-rw-r--r--libc/misc/dirent/Makefile46
-rw-r--r--libc/misc/error/Makefile38
-rw-r--r--libc/misc/file/Makefile47
-rw-r--r--libc/misc/fnmatch/Makefile43
-rw-r--r--libc/misc/ftw/Makefile40
-rw-r--r--libc/misc/glob/Makefile45
-rw-r--r--libc/misc/gnu/Makefile43
-rw-r--r--libc/misc/internals/Makefile59
-rw-r--r--libc/misc/intl/Makefile49
-rw-r--r--libc/misc/locale/Makefile67
-rw-r--r--libc/misc/mntent/Makefile43
-rw-r--r--libc/misc/pthread/Makefile40
-rw-r--r--libc/misc/regex/Makefile43
-rw-r--r--libc/misc/search/Makefile69
-rw-r--r--libc/misc/statfs/Makefile44
-rw-r--r--libc/misc/syslog/Makefile47
-rw-r--r--libc/misc/sysvipc/Makefile63
-rw-r--r--libc/misc/time/Makefile72
-rw-r--r--libc/misc/ttyent/Makefile38
-rw-r--r--libc/misc/utmp/Makefile43
-rw-r--r--libc/misc/wchar/Makefile61
-rw-r--r--libc/misc/wctype/Makefile60
-rw-r--r--libc/misc/wordexp/Makefile38
-rw-r--r--libc/pwd_grp/Makefile65
-rw-r--r--libc/signal/Makefile44
-rw-r--r--libc/stdio/Makefile151
-rw-r--r--libc/stdlib/Makefile143
-rw-r--r--libc/stdlib/malloc-simple/Makefile44
-rw-r--r--libc/stdlib/malloc-standard/Makefile55
-rw-r--r--libc/stdlib/malloc/Makefile58
-rw-r--r--libc/string/Makefile95
-rw-r--r--libc/string/arm/Makefile41
-rw-r--r--libc/string/frv/Makefile40
-rw-r--r--libc/string/generic/Makefile41
-rw-r--r--libc/string/i386/Makefile42
-rw-r--r--libc/string/mips/Makefile40
-rw-r--r--libc/string/powerpc/Makefile40
-rw-r--r--libc/string/sh64/Makefile42
-rw-r--r--libc/string/sparc/Makefile35
-rw-r--r--libc/string/x86_64/Makefile35
-rw-r--r--libc/sysdeps/Makefile40
-rw-r--r--libc/sysdeps/linux/Makefile43
-rw-r--r--libc/sysdeps/linux/arm/Makefile77
-rw-r--r--libc/sysdeps/linux/common/Makefile63
-rw-r--r--libc/sysdeps/linux/i386/Makefile77
-rw-r--r--libc/sysdeps/linux/mips/Makefile80
-rw-r--r--libc/sysdeps/linux/powerpc/Makefile77
-rw-r--r--libc/sysdeps/linux/x86_64/Makefile74
-rw-r--r--libc/termios/Makefile53
-rw-r--r--libc/unistd/Makefile58
-rw-r--r--libcrypt/Makefile70
-rw-r--r--libintl/Makefile67
-rw-r--r--libm/Makefile131
-rw-r--r--libnsl/Makefile59
-rw-r--r--libpthread/Makefile74
-rw-r--r--libpthread/linuxthreads/Makefile90
-rw-r--r--libpthread/linuxthreads_db/Makefile67
-rw-r--r--libresolv/Makefile64
-rw-r--r--librt/Makefile61
-rw-r--r--libutil/Makefile73
70 files changed, 602 insertions, 3751 deletions
diff --git a/Makefile b/Makefile
index 05547b69f..652694f22 100644
--- a/Makefile
+++ b/Makefile
@@ -11,16 +11,21 @@
noconfig_targets := menuconfig config oldconfig randconfig \
defconfig allyesconfig allnoconfig clean distclean \
release dist tags
+
TOPDIR=./
-include Rules.mak
-RTLD_DIR =
+top_srcdir=$(TOPDIR)
+top_builddir=./
+include $(top_builddir)Rules.mak
+
+# need to have libc.so built, before we can build the others
ifeq ($(HAVE_SHARED),y)
-RTLD_DIR = ldso
+PRE_DIRS = ldso libc
+DIRS = ldso libcrypt libresolv libnsl libutil librt
+else
+PRE_DIRS = libc
+DIRS = libcrypt libresolv libnsl libutil librt
endif
-# need to have libc built, before we can build the others
-PRE_DIRS = $(RTLD_DIR) libc
-DIRS = $(RTLD_DIR) libcrypt libresolv libnsl libutil librt
ifeq ($(UCLIBC_HAS_FLOATS),y)
DIRS += libm
endif
@@ -44,12 +49,12 @@ finished: subdirs
$(SECHO)
include/bits/uClibc_config.h: .config
- @if [ ! -x ./extra/config/conf ] ; then \
- $(MAKE) -C extra/config conf; \
+ @if [ ! -x $(top_builddir)extra/config/conf ] ; then \
+ $(MAKE) -C $(top_builddir)extra/config conf; \
fi
- $(RM) -r include/bits
- $(INSTALL) -d include/bits
- @./extra/config/conf -o extra/Configs/Config.in
+ $(RM) -r $(top_builddir)include/bits
+ $(INSTALL) -d $(top_builddir)include/bits
+ @$(top_builddir)extra/config/conf -o $(top_srcdir)extra/Configs/Config.in
# For the moment, we have to keep re-running this target
# because the fix includes scripts rely on pre-processers
@@ -61,12 +66,18 @@ export header_extra_args =
else
export header_extra_args = -n
endif
-headers: include/bits/uClibc_config.h
+headers: $(top_srcdir)include/bits/uClibc_config.h
@$(SHELL_SET_X); \
- ./extra/scripts/fix_includes.sh \
+ $(top_srcdir)extra/scripts/fix_includes.sh \
-k $(KERNEL_SOURCE) -t $(TARGET_ARCH) \
$(header_extra_args)
- @cd include/bits; \
+ if [ -f libc/sysdeps/linux/$(TARGET_ARCH)/fpu_control.h ] ; then \
+ $(LN) -fs ../libc/sysdeps/linux/$(TARGET_ARCH)/fpu_control.h include/ ; \
+ else \
+ $(LN) -fs ../libc/sysdeps/linux/common/fpu_control.h include/ ; \
+ fi
+ $(LN) -fs ../libc/sysdeps/linux/common/dl-osinfo.h include/
+ @cd $(top_builddir)include/bits; \
set -e; \
for i in `ls ../../libc/sysdeps/linux/common/bits/*.h` ; do \
$(LN) -fs $$i .; \
@@ -76,7 +87,7 @@ headers: include/bits/uClibc_config.h
$(LN) -fs $$i .; \
done; \
fi
- @cd include/sys; \
+ @cd $(top_builddir)include/sys; \
set -e; \
for i in `ls ../../libc/sysdeps/linux/common/sys/*.h` ; do \
$(LN) -fs $$i .; \
@@ -86,20 +97,23 @@ headers: include/bits/uClibc_config.h
$(LN) -fs $$i .; \
done; \
fi
- @cd $(TOPDIR); \
+ @cd $(top_builddir); \
set -e; \
$(SHELL_SET_X); \
TOPDIR=. CC="$(CC)" /bin/sh extra/scripts/gen_bits_syscall_h.sh > include/bits/sysnum.h.new; \
if cmp include/bits/sysnum.h include/bits/sysnum.h.new >/dev/null 2>&1; then \
$(RM) include/bits/sysnum.h.new; \
else \
+ $(RM) include/bits/sysnum.h; \
mv -f include/bits/sysnum.h.new include/bits/sysnum.h; \
fi
+ifeq ($(HAVE_SHARED),y)
+ $(MAKE) -C ldso headers-y
+endif
ifeq ($(UCLIBC_HAS_THREADS),y)
- $(MAKE) -C libpthread headers
+ $(MAKE) -C libpthread headers-y
endif
- $(MAKE) -C libc/sysdeps/linux/common headers
- $(MAKE) -C libc/sysdeps/linux/$(TARGET_ARCH) headers
+ $(MAKE) -C libc/sysdeps/linux headers-y
# Command used to download source code
WGET:=wget --passive-ftp
@@ -108,14 +122,14 @@ LOCALE_DATA_FILENAME:=uClibc-locale-030818.tgz
pregen: headers
ifeq ($(UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA),y)
- (cd extra/locale; \
+ (cd $(top_builddir)extra/locale; \
if [ ! -f $(LOCALE_DATA_FILENAME) ] ; then \
$(WGET) http://www.uclibc.org/downloads/$(LOCALE_DATA_FILENAME) ; \
fi )
endif
ifeq ($(UCLIBC_PREGENERATED_LOCALE_DATA),y)
- (cd extra/locale; zcat $(LOCALE_DATA_FILENAME) | tar -xvf -)
- $(MAKE) -C extra/locale pregen
+ (cd $(top_builddir)extra/locale; zcat $(LOCALE_DATA_FILENAME) | tar -xvf -)
+ $(MAKE) -C $(top_srcdir)extra/locale pregen
endif
pre_subdirs: $(patsubst %, _pre_dir_%, $(PRE_DIRS))
@@ -126,13 +140,10 @@ subdirs: $(patsubst %, _dir_%, $(DIRS))
$(patsubst %, _dir_%, $(DIRS)): pre_subdirs
$(MAKE) -C $(patsubst _dir_%, %, $@)
-tags:
- ctags -R
-
install: install_runtime install_dev finished2
-RUNTIME_PREFIX_LIB_FROM_DEVEL_PREFIX_LIB=$(shell extra/scripts/relative_path.sh $(DEVEL_PREFIX)lib $(RUNTIME_PREFIX)lib)
+RUNTIME_PREFIX_LIB_FROM_DEVEL_PREFIX_LIB=$(shell $(top_srcdir)extra/scripts/relative_path.sh $(DEVEL_PREFIX)lib $(RUNTIME_PREFIX)lib)
# Installs header files.
install_headers:
@@ -227,12 +238,12 @@ ifeq ($(HAVE_SHARED),y)
$(LN) -sf $(RUNTIME_PREFIX_LIB_FROM_DEVEL_PREFIX_LIB)$$i.$(MAJOR_VERSION) \
$(PREFIX)$(DEVEL_PREFIX)lib/$$i; \
done
- if [ -f $(TOPDIR)lib/libc.so -a -f $(PREFIX)$(RUNTIME_PREFIX)lib/$(SHARED_MAJORNAME) ] ; then \
+ if [ -f $(top_builddir)lib/libc.so -a -f $(PREFIX)$(RUNTIME_PREFIX)lib/$(SHARED_MAJORNAME) ] ; then \
$(RM) $(PREFIX)$(DEVEL_PREFIX)lib/libc.so; \
sed -e 's:$(NONSHARED_LIBNAME):$(DEVEL_PREFIX)lib/$(NONSHARED_LIBNAME):' \
-e 's:$(SHARED_MAJORNAME):$(RUNTIME_PREFIX)lib/$(SHARED_MAJORNAME):' \
-e 's:$(UCLIBC_LDSO):$(RUNTIME_PREFIX)lib/$(UCLIBC_LDSO):' \
- $(TOPDIR)lib/libc.so > $(PREFIX)$(DEVEL_PREFIX)lib/libc.so; \
+ $(top_builddir)lib/libc.so > $(PREFIX)$(DEVEL_PREFIX)lib/libc.so; \
fi
ifeq ($(PTHREADS_DEBUG_SUPPORT),y)
$(LN) -sf $(RUNTIME_PREFIX_LIB_FROM_DEVEL_PREFIX_LIB)libthread_db.so.1 \
@@ -331,17 +342,17 @@ defconfig: extra/config/conf
clean:
@$(RM) -r lib include/bits
- $(RM) libc/*.a libc/obj.* libc/nonshared_obj.*
+ $(RM) lib*/*.a ldso/*/*.a libpthread/*/*.a
$(RM) libc/misc/internals/interp.c
- $(RM) ldso/libdl/*.a
$(RM) include/fpu_control.h include/dl-osinfo.h
$(MAKE) -C extra/locale clean
- $(MAKE) -C ldso headers_clean
- $(MAKE) -C libpthread headers_clean
+ $(MAKE) -C ldso headers_clean-y
+ $(MAKE) -C libpthread headers_clean-y
+ $(MAKE) -C libc/sysdeps/linux headers_clean-y
$(MAKE) -C test clean
$(MAKE) -C utils clean
@set -e; \
- for i in `(cd $(TOPDIR)/libc/sysdeps/linux/common/sys; ls *.h)` ; do \
+ for i in `(cd libc/sysdeps/linux/common/sys; ls *.h)` ; do \
$(RM) include/sys/$$i; \
done; \
if [ -d libc/sysdeps/linux/$(TARGET_ARCH)/sys ] ; then \
@@ -350,10 +361,7 @@ clean:
done; \
fi
@$(RM) include/linux include/asm*
- @if [ -d libc/sysdeps/linux/$(TARGET_ARCH) ]; then \
- $(MAKE) -C libc/sysdeps/linux/$(TARGET_ARCH) clean; \
- fi
- -find . \( -name \*.o -o -name \*.os \) -exec $(RM) {} \;
+ -find . \( -name \*.o -o -name \*.os -o -name \*.oS \) -exec $(RM) {} \;
distclean: clean
-find . \( -name core -o -name \*.orig -o -name \*~ \) -exec $(RM) {} \;
@@ -370,6 +378,8 @@ dist release:
endif # ifeq ($(HAVE_DOT_CONFIG),y)
+include $(top_srcdir)Makerules
+
check:
$(MAKE) -C test
diff --git a/ldso/Makefile b/ldso/Makefile
index 57ddd4f3a..2dea1b3e9 100644
--- a/ldso/Makefile
+++ b/ldso/Makefile
@@ -2,59 +2,14 @@
#
# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org>
#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU Library General Public License as published by the Free
-# Software Foundation; either version 2 of the License, or (at your option) any
-# later version.
+# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Library General Public License
-# along with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
TOPDIR=../
-include $(TOPDIR)Rules.mak
-
-DIRS = ldso libdl
-
-ifeq ($(HAVE_SHARED),y)
-all: subdirs
-else
-all:
-endif
-
-LN_HEADERS := $(patsubst %, include/%, elf.h)
-LN_ARCH_HEADERS := $(patsubst %, include/%, dl-startup.h dl-syscalls.h dl-sysdep.h dl-debug.h)
-HEADERS := $(LN_HEADERS) $(LN_ARCH_HEADERS) include/dl-progname.h
-
-headers: $(HEADERS)
-
-$(LN_HEADERS):
- $(LN) -sf $(TOPDIR)../$@ $@
-
-$(LN_ARCH_HEADERS):
- $(LN) -sf ../ldso/$(TARGET_ARCH)/$(patsubst include/%,%,$@) $@
-
-include/dl-progname.h:
- echo '#include "$(TARGET_ARCH)/elfinterp.c"' \
- > include/dl-progname.h
-
-headers_clean:
- $(RM) $(HEADERS)
-
-clean: subdirs_clean headers_clean
-
-subdirs: $(patsubst %, _dir_%, $(DIRS))
-subdirs_clean: $(patsubst %, _dirclean_%, $(DIRS))
-
-$(patsubst %, _dir_%, $(DIRS)): headers
- $(MAKE) -C $(patsubst _dir_%, %, $@)
-
-$(patsubst %, _dirclean_%, $(DIRS)): dummy
- $(MAKE) -C $(patsubst _dirclean_%, %, $@) clean
-.PHONY: dummy
+top_srcdir=$(TOPDIR)
+top_builddir=../
+include $(top_builddir)Rules.mak
+all: libs
+include Makefile.in
+include $(top_srcdir)Makerules
diff --git a/ldso/ldso/Makefile b/ldso/ldso/Makefile
index bdc4904f1..f92f205a5 100644
--- a/ldso/ldso/Makefile
+++ b/ldso/ldso/Makefile
@@ -1,99 +1,15 @@
# Makefile for uClibc
#
-# Copyright (C) 2000-2004 Erik Andersen <andersen@uclibc.org>
+# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org>
#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU Library General Public License as published by the Free
-# Software Foundation; either version 2 of the License, or (at your option) any
-# later version.
+# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Library General Public License
-# along with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
TOPDIR=../../
-include $(TOPDIR)Rules.mak
-
-XXFLAGS=$(XWARNINGS) $(SSP_DISABLE_FLAGS) -DNOT_IN_libc
-
-ifeq ($(DODEBUG),y)
-# Not really much point in including debugging info, since gdb
-# can't really debug ldso, since gdb requires help from ldso to
-# debug things....
-XXFLAGS+=-Os -g
-else
-XXFLAGS+=$(OPTIMIZATION)
-endif
-XXFLAGS+= -DUCLIBC_LDSO=\"$(UCLIBC_LDSO)\" $(XARCH_CFLAGS) $(CPU_CFLAGS) $(PICFLAG) \
- -DUCLIBC_RUNTIME_PREFIX=\"$(RUNTIME_PREFIX)\" \
- -fno-builtin -nostdinc -D_LIBC -I$(TOPDIR)ldso/include -I. -I$(TOPDIR)include
-
-XXFLAGS+=-isystem $(shell $(CC) -print-file-name=include)
-
-ifeq ($(SUPPORT_LD_DEBUG),y)
-XXFLAGS+=-D__SUPPORT_LD_DEBUG__
-endif
-
-ifeq ($(SUPPORT_LD_DEBUG_EARLY),y)
-XXFLAGS+=-D__SUPPORT_LD_DEBUG_EARLY__
-endif
-
-#This stuff will not work with -fomit-frame-pointer
-XXFLAGS := $(XXFLAGS:-fomit-frame-pointer=)
-
-# BEWARE!!! At least mips* will die if -O0 is used!!!
-ifeq ($(strip $(TARGET_ARCH)),mips)
-XXFLAGS := $(XXFLAGS:-O0=-O1)
-endif
-
-ASFLAGS=$(XXFLAGS)
-ifeq ($(UCLIBC_BUILD_NOEXECSTACK),y)
-ASFLAGS+=$(call check_as,--noexecstack)
-endif
-
-LDFLAGS=$(CPU_LDFLAGS-y) -e _start -z now -Bsymbolic -shared --warn-common --export-dynamic --sort-common \
- -z combreloc --discard-locals --discard-all --no-undefined
-
-ifeq ($(UCLIBC_BUILD_RELRO),y)
-LDFLAGS+=-z relro
-endif
-
-ifneq ($(SUPPORT_LD_DEBUG),y)
-LDFLAGS+=-s
-endif
-
-LIB_NAME := ld-uClibc
-SO_LIB_NAME := $(TOPDIR)lib/$(UCLIBC_LDSO)
-SO_FULL_NAME := $(LIB_NAME)-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so
-
-CSRC := ldso.c
-COBJ := $(patsubst %.c,%.o, $(CSRC))
-
-SSRC := $(wildcard $(TARGET_ARCH)/*.S)
-SOBJ := $(patsubst %.S,%.o, $(SSRC))
-
-OBJS := $(SOBJ) $(COBJ)
-
-all: $(SO_LIB_NAME)
-
-$(SO_LIB_NAME): $(OBJS)
- $(INSTALL) -d $(TOPDIR)lib
- $(RM) $(TOPDIR)lib/$(SO_FULL_NAME) $@
- $(STRIPTOOL) -x -R .note -R .comment $^
- $(LD) $(LDFLAGS) -soname=$(UCLIBC_LDSO) \
- -o $(TOPDIR)lib/$(SO_FULL_NAME) $^ $(LIBGCC)
- $(LN) -sf $(SO_FULL_NAME) $@
-
-$(COBJ): %.o : %.c
- $(CC) $(XXFLAGS) -c $< -o $@
-
-$(SOBJ): %.o : %.S
- $(CC) $(ASFLAGS) -c $< -o $@
-clean:
- $(RM) *.o */*.o *~ core
+top_srcdir=$(TOPDIR)
+top_builddir=../../
+include $(top_builddir)Rules.mak
+all: libs
+include Makefile.in
+include $(top_srcdir)Makerules
diff --git a/ldso/libdl/Makefile b/ldso/libdl/Makefile
index 730d95c23..f92f205a5 100644
--- a/ldso/libdl/Makefile
+++ b/ldso/libdl/Makefile
@@ -1,95 +1,15 @@
# Makefile for uClibc
#
-# Copyright (C) 2000 by Lineo, inc.
-# Copyright (C) 2000-2002 Erik Andersen <andersen@uclibc.org>
+# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org>
#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU Library General Public License as published by the Free
-# Software Foundation; either version 2 of the License, or (at your option) any
-# later version.
+# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Library General Public License
-# along with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
TOPDIR=../../
-include $(TOPDIR)Rules.mak
-
-XXFLAGS=$(XWARNINGS) $(SSP_CFLAGS) $(SSP_ALL_CFLAGS)
-ifeq ($(DODEBUG),y)
-XXFLAGS+=-O0 -g3
-else
-XXFLAGS+=$(OPTIMIZATION)
-endif
-XXFLAGS+= $(XARCH_CFLAGS) $(CPU_CFLAGS) \
- -DUCLIBC_RUNTIME_PREFIX=\"$(RUNTIME_PREFIX)\" \
- -fno-builtin -nostdinc -D_LIBC -I$(TOPDIR)ldso/include -I$(TOPDIR)ldso/ldso -I$(TOPDIR)include
-
-XXFLAGS+=-isystem $(shell $(CC) -print-file-name=include)
-ifeq ($(SUPPORT_LD_DEBUG),y)
-XXFLAGS+=-D__SUPPORT_LD_DEBUG__
-endif
-XXFLAGS_NOPIC:=$(XXFLAGS)
-ifeq ($(DOPIC),y)
- XXFLAGS += $(PICFLAG) -DSHARED
-endif
-
-# BEWARE!!! At least mips* will die if -O0 is used!!!
-ifeq ($(TARGET_ARCH),mips)
-XXFLAGS := $(XXFLAGS:-O0=-O1)
-endif
-
-LIB_NAME := libdl
-AR_LIB_NAME := $(TOPDIR)lib/$(LIB_NAME).a
-SO_LIB_NAME := $(TOPDIR)lib/$(LIB_NAME).so
-SO_FULL_NAME := $(LIB_NAME)-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so
-
-CSRC := libdl.c
-OBJS := libdl.o
-PIC_OBJS := libdl_pic.o
-
-# we do not get here, do we need a libdl.a, if ld.so is not ours?
-#ifeq ($(HAVE_SHARED),y)
-all: $(AR_LIB_NAME) $(SO_LIB_NAME)
-#else
-#all: $(AR_LIB_NAME)
-#endif
-
-$(AR_LIB_NAME): $(OBJS) ../ldso/$(TARGET_ARCH)/resolve.o
- $(INSTALL) -d $(TOPDIR)lib
- $(RM) $@
- $(AR) $(ARFLAGS) $@ $^
-
-shared_$(LIB_NAME).a: $(PIC_OBJS)
- $(RM) $@
- $(STRIPTOOL) -x -R .note -R .comment $^
- $(AR) $(ARFLAGS) $@ $^
-
-# this will be built only on the second round, when libc.so is present,
-# else we would link against libc.a
-$(SO_LIB_NAME): shared_$(LIB_NAME).a
- if [ -f $(TOPDIR)lib/libc.so ] ; then \
- $(RM) $(TOPDIR)lib/$(SO_FULL_NAME) $(SO_LIB_NAME).$(MAJOR_VERSION) $@ ; \
- $(LD) $(LDFLAGS) -soname=$(LIB_NAME).so.$(MAJOR_VERSION) \
- -o $(TOPDIR)lib/$(SO_FULL_NAME) -fini dl_cleanup --whole-archive $< \
- --no-whole-archive $(TOPDIR)libc/misc/internals/interp.o \
- -L$(TOPDIR)lib -lc $(LDADD_LIBFLOAT) $(TOPDIR)lib/$(UCLIBC_LDSO) $(LIBGCC) ; \
- $(LN) -sf $(SO_FULL_NAME) $(SO_LIB_NAME).$(MAJOR_VERSION) ; \
- $(LN) -sf $(SO_FULL_NAME) $@ ; \
- fi
-
-$(OBJS): %.o : %.c
- $(CC) $(XXFLAGS_NOPIC) -c $< -o $@
- $(STRIPTOOL) -x -R .note -R .comment $*.o
-
-libdl_pic.o: libdl.c
- $(CC) $(XXFLAGS) -c $< -o $@
-clean:
- $(RM) *.[oa] *~ core
+top_srcdir=$(TOPDIR)
+top_builddir=../../
+include $(top_builddir)Rules.mak
+all: libs
+include Makefile.in
+include $(top_srcdir)Makerules
diff --git a/libc/Makefile b/libc/Makefile
index d27990665..2dea1b3e9 100644
--- a/libc/Makefile
+++ b/libc/Makefile
@@ -1,120 +1,15 @@
# Makefile for uClibc
#
-# Copyright (C) 2000 by Lineo, inc.
-# Copyright (C) 2000,2001 Erik Andersen <andersen@uclibc.org>
+# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org>
#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU Library General Public License as published by the Free
-# Software Foundation; either version 2 of the License, or (at your option) any
-# later version.
+# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Library General Public License
-# along with this program; if not, write to the Free Software Foundation, Inc.,