[uClibc-cvs] uClibc Makefile,1.233,1.234 Rules.mak,1.151,1.152

Erik Andersen andersen at uclibc.org
Fri Nov 7 04:13:32 UTC 2003


Update of /var/cvs/uClibc
In directory winder:/tmp/cvs-serv12364

Modified Files:
	Makefile Rules.mak 
Log Message:
It is remotely possible the utils might even compile this time
around...


Index: Rules.mak
===================================================================
RCS file: /var/cvs/uClibc/Rules.mak,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -d -r1.151 -r1.152
--- Rules.mak	5 Nov 2003 06:31:40 -0000	1.151
+++ Rules.mak	7 Nov 2003 04:13:28 -0000	1.152
@@ -194,11 +194,9 @@
     ifeq ($(BUILD_UCLIBC_LDSO),y)
 	LDSO:=$(TOPDIR)lib/$(UCLIBC_LDSO)
 	DYNAMIC_LINKER:=$(SHARED_LIB_LOADER_PREFIX)/$(UCLIBC_LDSO)
-	BUILD_DYNAMIC_LINKER:=$(shell cd $(TOPDIR) && pwd)/lib/$(UCLIBC_LDSO)
     else
 	LDSO:=$(SYSTEM_LDSO)
 	DYNAMIC_LINKER:=/lib/$(strip $(subst ",, $(notdir $(SYSTEM_LDSO))))
-	BUILD_DYNAMIC_LINKER:=/lib/$(strip $(subst ",, $(notdir $(SYSTEM_LDSO))))
    endif
 endif
 

Index: Makefile
===================================================================
RCS file: /var/cvs/uClibc/Makefile,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -d -r1.233 -r1.234
--- Makefile	6 Nov 2003 22:38:44 -0000	1.233
+++ Makefile	7 Nov 2003 04:13:28 -0000	1.234
@@ -179,7 +179,7 @@
 tags:
 	ctags -R
 
-install: install_dev install_runtime install_utils finished2
+install: install_runtime install_dev finished2
 
 
 # Installs header files and development library links.
@@ -270,26 +270,16 @@
 	fi;
 endif
 
+.PHONY: utils
 ifeq ($(strip $(HAVE_SHARED)),y)
-utils: $(TOPDIR)utils/ldd
+utils:
 	$(MAKE) -C utils
 else
 utils: dummy
 endif
 
 install_utils: utils
-ifeq ($(strip $(HAVE_SHARED)),y)
-	$(INSTALL) -d $(PREFIX)$(RUNTIME_PREFIX)sbin
-	$(INSTALL) -d $(PREFIX)$(RUNTIME_PREFIX)usr/bin
-	$(INSTALL) -m 755 ldso/util/ldd \
-		$(PREFIX)$(RUNTIME_PREFIX)usr/bin/ldd
-	$(INSTALL) -m 755 ldso/util/ldconfig \
-		$(PREFIX)$(RUNTIME_PREFIX)sbin/ldconfig;
-	# For now, don't bother with readelf since surely the host
-	# system has binutils, or we couldn't have gotten this far...
-	#$(INSTALL) -m 755 ldso/util/readelf \
-	#	$(PREFIX)$(RUNTIME_PREFIX)usr/bin/readelf
-endif
+	$(MAKE) CFLAGS= LDFLAGS= -C utils install
 ifeq ($(strip $(UCLIBC_HAS_LOCALE)),y)
 	@$(MAKE) -C libc/misc/wchar iconv.target
 	$(INSTALL) -d $(PREFIX)$(RUNTIME_PREFIX)/usr/bin;




More information about the uClibc-cvs mailing list