diff options
author | Manuel Novoa III <mjn3@codepoet.org> | 2001-05-31 21:23:20 +0000 |
---|---|---|
committer | Manuel Novoa III <mjn3@codepoet.org> | 2001-05-31 21:23:20 +0000 |
commit | dd4d42c2b998b2b95912ac04106fb7a9b1b0a57e (patch) | |
tree | 19bdbd5e7c1fc93edcd14b115fdbdf3be205389d /Makefile | |
parent | f43cd38254b0f915fcade2f61218430ebb5e3db3 (diff) |
Removed INSTALL_DIR and replaced it with DEVEL_PREFIX, ROOT_DIR, and
TARGET_PREFIX to allow more flexibility. Also modified the gcc wrapper
to do the right thing if -Wl,--dynamic-linker,xxx is passed on the command
line. The gcc wrapper will also check the env variable UCLIBC_GCC_LDOPT
for a dynamic linker option at runtime (although command line arg overrides
the env variable).
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 49 |
1 files changed, 31 insertions, 18 deletions
@@ -35,6 +35,10 @@ ifeq ($(DO_SHARED),shared) endif DIRS = extra $(LDSO_DIR) libc libcrypt libresolv libutil libm +ifndef $(TARGET_PREFIX) + TARGET_PREFIX = `pwd`/_install +endif + all: headers uClibc_config.h subdirs $(DO_SHARED) done shared: @@ -143,40 +147,49 @@ $(patsubst %, _dir_%, $(DIRS)) : dummy tags: ctags -R -install: install_runtime install_dev +install: install_dev -# Installs shared library -install_runtime: - install -d $(INSTALL_DIR)/lib - cp -fa lib/* $(INSTALL_DIR)/lib; +# Installs shared libraries for a target. +install_target: +ifeq ($(DO_SHARED),shared) + install -d $(TARGET_PREFIX)$(ROOT_DIR)/lib + cp -fa lib/*.so* $(TARGET_PREFIX)$(ROOT_DIR)/lib; #ifeq ($(LDSO_PRESENT), $(TARGET_ARCH)) - ln -sf $(INSTALL_DIR)/lib/$(UCLIBC_LDSO) /lib/$(UCLIBC_LDSO); - install -d $(INSTALL_DIR)/etc - -@if [ -x ldso/util/ldconfig ] ; then ldso/util/ldconfig; fi +# install -d $(TARGET_PREFIX)$(ROOT_DIR)/etc +# -@if [ -x ldso/util/ldconfig ] ; then ldso/util/ldconfig; fi #endif +endif # Installs development library and headers # This is done with the assumption that it can blow away anything -# in $(INSTALL_DIR)/include. Probably true only if you're using +# in $(DEVEL_PREFIX)$(ROOT_DIR)/include. Probably true only if you're using # a packaging system. install_dev: - install -d $(INSTALL_DIR)/usr/include - install -d $(INSTALL_DIR)/usr/include/bits - rm -f $(INSTALL_DIR)/usr/include/asm - rm -f $(INSTALL_DIR)/usr/include/linux - ln -s $(KERNEL_SOURCE)/include/asm $(INSTALL_DIR)/usr/include/asm - ln -s $(KERNEL_SOURCE)/include/linux $(INSTALL_DIR)/usr/include/linux + install -d $(DEVEL_PREFIX)$(ROOT_DIR)/lib + cp -fa lib/*.so* $(DEVEL_PREFIX)$(ROOT_DIR)/lib; + install -d $(DEVEL_PREFIX)$(ROOT_DIR)/usr/lib + cp -fa lib/*.[ao] $(DEVEL_PREFIX)$(ROOT_DIR)/usr/lib; + install -d $(DEVEL_PREFIX)$(ROOT_DIR)/etc + install -d $(DEVEL_PREFIX)$(ROOT_DIR)/usr/include + install -d $(DEVEL_PREFIX)$(ROOT_DIR)/usr/include/bits + rm -f $(DEVEL_PREFIX)$(ROOT_DIR)/usr/include/asm + rm -f $(DEVEL_PREFIX)$(ROOT_DIR)/usr/include/linux + ln -s $(KERNEL_SOURCE)/include/asm $(DEVEL_PREFIX)$(ROOT_DIR)/usr/include/asm + ln -s $(KERNEL_SOURCE)/include/linux $(DEVEL_PREFIX)$(ROOT_DIR)/usr/include/linux find include/ -type f -depth -not -path "*CVS*" -exec install \ - -D -m 644 {} $(INSTALL_DIR)/usr/'{}' ';' + -D -m 644 {} $(DEVEL_PREFIX)$(ROOT_DIR)/usr/'{}' ';' find include/bits/ -type f -depth -not -path "*CVS*" -exec install \ - -D -m 644 {} $(INSTALL_DIR)/usr/'{}' ';' - install -m 644 include/bits/uClibc_config.h $(INSTALL_DIR)/usr/include/bits/ + -D -m 644 {} $(DEVEL_PREFIX)$(ROOT_DIR)/usr/'{}' ';' + install -m 644 include/bits/uClibc_config.h $(DEVEL_PREFIX)$(ROOT_DIR)/usr/include/bits/ $(MAKE) -C extra/gcc-uClibc install clean: @rm -rf tmp lib - find include -type l -exec rm -f {} \; - find . \( -name \*.o -o -name \*.a -o -name \*.so -o -name core \) -exec rm -f {} \; +ifeq ($(DO_SHARED),shared) + make -C ldso clean +endif .PHONY: dummy subdirs |