3 files changed, 23 insertions, 232 deletions
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