From 249cb00d9f655778aa8a4519ee3e610a904d694d Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Fri, 11 May 2001 21:26:43 +0000 Subject: Rework where libraries get installed to. Now thew will be compiled and dropped into a uClibc/lib dir when compiling, which will make life a bit easier when installing and cleaning up. Preface uClibc with 'lib' so ldconfig will recognize it as a library. Make all libraries have the uClibc version number attached, making upgrades possible by using the traditional symlink to the .so name plan. -Erik --- Makefile | 31 ++++++------------------------- 1 file changed, 6 insertions(+), 25 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index de78bf76f..4957111ab 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,7 @@ # Makefile for uClibc # -# Copyright (C) 2000 by Lineo, inc. +# Copyright (C) 2000, 2001 by Lineo, inc. +# Written by Erik Andersen , # # 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 @@ -56,7 +57,8 @@ shared: $(LIBNAME) ./$(LIBNAME) $(LDSO) ; \ fi @rm -rf tmp - ln -sf $(SHARED_FULLNAME) $(SHARED_MAJORNAME) + cp -a $(SHARED_FULLNAME) lib; + (cd lib; ln -sf $(SHARED_FULLNAME) $(SHARED_MAJORNAME)); @$(MAKE) -C libcrypt shared @$(MAKE) -C libutil shared @$(MAKE) -C libm shared @@ -110,23 +112,12 @@ $(patsubst %, _dir_%, $(DIRS)) : dummy $(patsubst %, _dirclean_%, $(DIRS) test) : dummy $(MAKE) -C $(patsubst _dirclean_%, %, $@) clean -install: install_runtime install_dev install_ldso +install: install_runtime install_dev # Installs shared library install_runtime: - @$(MAKE) -C libcrypt install - @$(MAKE) -C libutil install - @$(MAKE) -C libm install -ifneq ($(DO_SHARED),) install -d $(INSTALL_DIR)/lib - rm -rf $(INSTALL_DIR)/lib/$(SHARED_FULLNAME) - rm -rf $(INSTALL_DIR)/lib/$(SHARED_MAJORNAME) - rm -rf $(INSTALL_DIR)/lib/libc.so - install -m 755 $(SHARED_FULLNAME) $(INSTALL_DIR)/lib/ - (cd $(INSTALL_DIR)/lib;ln -sf $(SHARED_FULLNAME) $(SHARED_MAJORNAME)) -else - echo shared library not installed -endif + cp -fa lib/* $(INSTALL_DIR)/lib; # Installs development library and headers # This is done with the assumption that it can blow away anything @@ -149,16 +140,6 @@ install_dev: install -d $(INSTALL_DIR)/bin $(MAKE) -C extra/gcc-uClibc install - -install_ldso: -ifeq ($(strip $(DO_SHARED)),shared) - $(MAKE) -C ld.so-1 install - install -d $(INSTALL_DIR)/etc - #$(TOPDIR)ld.so-1/util/ldconfig -else - @echo "Skipping shared library support" -endif - uClibc_config.h: Config @echo "/* WARNING!!! AUTO-GENERATED FILE!!! DO NOT EDIT!!! */" > uClibc_config.h @echo "#if !defined __FEATURES_H && !defined __need_uClibc_config_h" >> uClibc_config.h -- cgit v1.2.3