about summary refs log tree commit diff
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile33
1 files changed, 6 insertions, 27 deletions
diff --git a/Makefile b/Makefile
index 61cf6904f6..03408c768e 100644
--- a/Makefile
+++ b/Makefile
@@ -95,7 +95,7 @@ install-bin = glibcbug
 
 ifeq (yes,$(build-shared))
 before-compile += $(objpfx)gnu/lib-names.h
-install_others += $(inst_includedir)/gnu/lib-names.h
+install-others += $(inst_includedir)/gnu/lib-names.h
 endif
 
 ifeq (yes,$(gnu-ld))
@@ -194,31 +194,10 @@ $(inst_includedir)/gnu/stubs.h: subdir_install
 
 ifeq (yes,$(build-shared))
 
-# Like gnu/stubs.h the gnu/lib-names.h header is not used while building the
-# libc itself.  So we generate it while installing.
-$(inst_includedir)/gnu/lib-names.h: $(objpfx)gnu/lib-names.h
+$(inst_includedir)/gnu/lib-names.h: $(common-objpfx)gnu/lib-names.h
 	if test -r $@ && cmp -s $< $@; \
 	then echo 'gnu/lib-names.h unchanged'; \
 	else $(INSTALL_DATA) $< $@; fi
-
-$(objpfx)gnu/lib-names.h: $(common-objpfx)soversions.mk
-	$(make-target-directory)
-	@rm -f $@
-	(echo '/* This file is automatically generated.';\
-	 echo '   It defines macros to allow user program to find the shared';\
-	 echo '   library files which come as part of GNU libc.  */';\
-	 echo '#ifndef __GNU_LIB_NAMES_H'; \
-	 echo '#define __GNU_LIB_NAMES_H	1'; \
-	 echo; \
-	 (libs='$(all-sonames)';\
-	  for l in $$libs; do \
-	    upname=`echo $$l | sed 's/[.]so.*//' | \
-		    tr '[:lower:]-' '[:upper:]_'`; \
-	    echo "#define	$${upname}_SO	\"$$l\""; \
-	  done;) | sort; \
-	 echo; \
-	 echo '#endif	/* gnu/lib-names.h */';) > $@
-generated += gnu/lib-names.h
 endif
 
 # The `glibcbug' script contains the version number and it shall be rebuild
@@ -229,7 +208,7 @@ $(objpfx)glibcbug: $(common-objpfx)config.status glibcbug.in
 # This makes the Info or DVI file of the documentation from the Texinfo source.
 .PHONY: info dvi
 info dvi:
-	$(MAKE) -C manual $@
+	$(MAKE) $(PARALLELMFLAGS) -C manual $@
 
 # This makes all the subdirectory targets.
 
@@ -243,7 +222,7 @@ all-subdirs-targets := $(foreach dir,$(subdirs),\
 # The action for each of those is to cd into the directory and make the
 # target there.
 $(all-subdirs-targets):
-	$(MAKE) -C $(@D) $(@F)
+	$(MAKE) $(PARALLELMFLAGS) -C $(@D) $(@F)
 
 .PHONY: $(+subdir_targets) $(all-subdirs-targets)
 
@@ -326,10 +305,10 @@ INSTALL: manual/maint.texi; $(format-me)
 NOTES: manual/creature.texi; $(format-me)
 
 rpm/%: subdir_distinfo
-	$(MAKE) -C $(@D) subdirs='$(subdirs)' $(@F)
+	$(MAKE) $(PARALLELMFLAGS) -C $(@D) subdirs='$(subdirs)' $(@F)
 
 # This is a special goal for people making binary distributions.  Normally
 # everybody uses the DES based crypt library but for the distribution we
 # need the only-MD5 based one as well.
 md5-crypt/libmd5crypt:
-	$(MAKE) -C $(@D) $(@F)
+	$(MAKE) $(PARALLELMFLAGS) -C $(@D) $(@F)