OSDN Git Service

(root) / uclinux-h8 / uClibc.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
- fix locale dependencies and make default locale generation less verbose.
[uclinux-h8/uClibc.git] / Makefile.in
diff --git a/Makefile.in b/Makefile.in
index d259088..5b666b8 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -17,11 +17,10 @@ noconfig_targets := menuconfig config oldconfig silentoldconfig randconfig \
 include $(top_builddir)Rules.mak
 sub_headers := headers
 
-#suspicious_dependency:=include/bits
-
 ifeq ($(HAVE_DOT_CONFIG),y)
 
 all: pregen libs
+libs: pregen
 
 # In this section, we need .config
 -include .config.cmd
@@ -58,7 +57,6 @@ ifeq ($(HAVE_DOT_CONFIG),y)
 # on spot to save us from alot of hazzle.
 include/bits/uClibc_config.h: extra/config/conf .config $(top_srcdir)extra/scripts/conf-header.sh | include/bits
        @$(disp_gen)
-       @#superfluous: $(Q)$(INSTALL) -d $(dir $@)
        $(Q)@$< -s $(top_srcdir)extra/Configs/Config.in
        $(Q)$(top_srcdir)extra/scripts/conf-header.sh .config > $@
        $(Q)$(MAKE) headers-y
@@ -149,7 +147,6 @@ headers-y += $(target-headers-sysdep)
 headers: include/bits/uClibc_config.h
 
 pregen: include/bits/sysnum.h headers
-       $(Q)$(if $(UCLIBC_HAS_LOCALE),$(MAKE) -C extra/locale locale_headers)
 
 include/bits/sysnum.h: $(top_srcdir)extra/scripts/gen_bits_syscall_h.sh
        $(Q)$(INSTALL) -d $(@D)
@@ -312,6 +309,7 @@ ifneq ($(UCLIBC_LINUX_SPECIFIC),y)
        $(RM) $(PREFIX)$(DEVEL_PREFIX)include/sys/inotify.h
        $(RM) $(PREFIX)$(DEVEL_PREFIX)include/sys/perm.h
        $(RM) $(PREFIX)$(DEVEL_PREFIX)include/sys/personality.h
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/sys/signalfd.h
 endif
 ifneq ($(UCLIBC_SV4_DEPRECATED),y)
        # Remove ustat.h since deprecated SV4 support was disabled upon request
@@ -350,18 +348,18 @@ ifneq ($(UCLIBC_SUPPORT_AI_ADDRCONFIG),y)
 endif
 
 # Installs development library links.
-install_dev: install_headers
+install_dev: install_headers all
        $(INSTALL) -d $(PREFIX)$(DEVEL_PREFIX)lib
        -$(INSTALL) -m 644 lib/*.[ao] $(PREFIX)$(DEVEL_PREFIX)lib/
 ifeq ($(HAVE_SHARED),y)
        for i in `find lib/ -type l -name 'lib[a-zA-Z]*.so' | \
-       sed -e 's/lib\///'` ; do \
+       $(SED) -e 's/lib\///'` ; do \
                $(LN) -sf $(RUNTIME_PREFIX_LIB_FROM_DEVEL_PREFIX_LIB)$$i.$(MAJOR_VERSION) \
                $(PREFIX)$(DEVEL_PREFIX)lib/$$i; \
        done
        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):' \
+               $(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):' \
                    $(top_builddir)lib/libc.so > $(PREFIX)$(DEVEL_PREFIX)lib/libc.so; \
@@ -384,9 +382,9 @@ ifeq ($(DOPIC),y)
 #      # If we build shared libraries then the static libs are PIC...
 #      # Make _pic.a symlinks to make mklibs.py and similar tools happy.
        if [ -d lib ] ; then \
-               for i in `find lib/  -type f -name 'lib*.a' | sed -e 's/lib\///'` ; do \
+               for i in `find lib/ -type f -name 'lib*.a' | $(SED) -e 's/lib\///'` ; do \
                        $(LN) -sf $$i $(PREFIX)$(DEVEL_PREFIX)lib/`echo $$i \
-                               | sed -e 's/\.a$$/_pic.a/'`; \
+                               | $(SED) -e 's/\.a$$/_pic.a/'`; \
                done ; \
        fi
 endif
@@ -395,14 +393,14 @@ ifeq ($(UCLIBC_FORMAT_SHARED_FLAT),y)
        for file in lib/lib*.gdb; do \
                if test -f $$file; then \
                        $(INSTALL) -m 755 $$file $(PREFIX)$(DEVEL_PREFIX)lib; \
-                       $(INSTALL) -m 755 `echo $$file | sed 's/\.gdb$$//'` \
+                       $(INSTALL) -m 755 `echo $$file | $(SED) 's/\.gdb$$//'` \
                          $(PREFIX)$(DEVEL_PREFIX)lib; \
                fi; \
        done
 endif
 
 # Installs run-time libraries
-install_runtime:
+install_runtime: all
 ifeq ($(HAVE_SHARED),y)
        $(INSTALL) -d $(PREFIX)$(RUNTIME_PREFIX)lib
        $(INSTALL) -m 644 lib/lib*-$(VERSION).so \
@@ -416,6 +414,8 @@ ifeq ($(HAVE_SHARED),y)
        fi
 endif
 
+hostutils:
+       $(Q)$(MAKE) CROSS="$(CROSS)" CC="$(CC)" HOSTCC="$(HOSTCC)" -C utils hostutils
 utils:
        $(Q)$(MAKE) CROSS="$(CROSS)" CC="$(CC)" -C utils
 
@@ -425,43 +425,43 @@ install_utils: utils
 
 endif # ifeq ($(HAVE_DOT_CONFIG),y)
 
-include/bits:
+include/bits include/config:
        @$(disp_mkdir)
        $(Q)$(INSTALL) -d $@
 
 # configuration
 # ---------------------------------------------------------------------------
-extra/config/conf extra/config/mconf: $(suspicious_dependency)
+extra/config/conf extra/config/mconf: | include/config
        $(Q)$(MAKE) -C extra/config $(notdir $@)
 
-menuconfig: extra/config/mconf $(suspicious_dependency)
+menuconfig: extra/config/mconf
        $(Q)./extra/config/mconf extra/Configs/Config.in
 
-config: extra/config/conf $(suspicious_dependency)
+config: extra/config/conf
        $(Q)./extra/config/conf extra/Configs/Config.in
 
-oldconfig: extra/config/conf $(suspicious_dependency)
+oldconfig: extra/config/conf
        $(Q)./extra/config/conf -o extra/Configs/Config.in
 
-silentoldconfig: extra/config/conf $(suspicious_dependency)
+silentoldconfig: extra/config/conf
        $(Q)./extra/config/conf -s extra/Configs/Config.in
 
-randconfig: extra/config/conf $(suspicious_dependency)
+randconfig: extra/config/conf
        $(Q)./extra/config/conf -r extra/Configs/Config.in
 
-allyesconfig: extra/config/conf $(suspicious_dependency)
+allyesconfig: extra/config/conf
        $(Q)./extra/config/conf -y extra/Configs/Config.in
-       sed -i -e "s/^DODEBUG=.*/# DODEBUG is not set/" .config
-       sed -i -e "s/^DOASSERTS=.*/# DOASSERTS is not set/" .config
-       sed -i -e "s/^SUPPORT_LD_DEBUG_EARLY=.*/# SUPPORT_LD_DEBUG_EARLY is not set/" .config
-       sed -i -e "s/^SUPPORT_LD_DEBUG=.*/# SUPPORT_LD_DEBUG is not set/" .config
-       sed -i -e "s/^UCLIBC_MJN3_ONLY=.*/# UCLIBC_MJN3_ONLY is not set/" .config
+       $(SED) -i -e "s/^DODEBUG=.*/# DODEBUG is not set/" .config
+       $(SED) -i -e "s/^DOASSERTS=.*/# DOASSERTS is not set/" .config
+       $(SED) -i -e "s/^SUPPORT_LD_DEBUG_EARLY=.*/# SUPPORT_LD_DEBUG_EARLY is not set/" .config
+       $(SED) -i -e "s/^SUPPORT_LD_DEBUG=.*/# SUPPORT_LD_DEBUG is not set/" .config
+       $(SED) -i -e "s/^UCLIBC_MJN3_ONLY=.*/# UCLIBC_MJN3_ONLY is not set/" .config
        $(Q)./extra/config/conf -o extra/Configs/Config.in
 
-allnoconfig: extra/config/conf $(suspicious_dependency)
+allnoconfig: extra/config/conf
        $(Q)./extra/config/conf -n extra/Configs/Config.in
 
-defconfig: extra/config/conf $(suspicious_dependency)
+defconfig: extra/config/conf
        $(Q)./extra/config/conf -d extra/Configs/Config.in \
                -D extra/Configs/defconfigs/$(ARCH)
 
About OSDN
Find Software
Develop Software
Help