diff options
| -rw-r--r-- | Makerules | 7 | ||||
| -rw-r--r-- | localedata/ChangeLog | 8 | ||||
| -rw-r--r-- | localedata/Makefile | 11 |
3 files changed, 14 insertions, 12 deletions
diff --git a/Makerules b/Makerules index 359f6d1cc6..6c0af11756 100644 --- a/Makerules +++ b/Makerules @@ -584,13 +584,6 @@ O%-lib = $(..)$(patsubst %,$(libtype$*),c) endif -ifndef static-only-routines -subdir_lib: $(objpfx)stamp.oS -$(objpfx)stamp.oS: - $(make-target-directory) - rm -f $@; > $@ -endif - # Rules to update the $(ar-symtab-name) member with ranlib, # one for each object flavor. define o-iterator-doit diff --git a/localedata/ChangeLog b/localedata/ChangeLog index 667e7fe4b0..671b69032c 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,3 +1,11 @@ +1998-03-30 17:20 Ulrich Drepper <drepper@cygnus.com> + + * Makerules: Remove duplicate rules to handle stamp.oS. + +1998-03-30 Ulrich Drepper <drepper@cygnus.com> + + * Makefile: Fix test rules from last patch. + 1998-03-22 Andreas Jaeger <aj@arthur.rhein-neckar.de> * locales/ru_RU: Abbreviations must end with a consonant. Fix for diff --git a/localedata/Makefile b/localedata/Makefile index 6e9bc20f1b..c01454393b 100644 --- a/localedata/Makefile +++ b/localedata/Makefile @@ -60,14 +60,15 @@ $(inst_i18ndir)/locales/%: locales/%; $(do-install) ifeq (no,$(cross-compiling)) -.PHONY: do-collate-test do-xfrm-test do-tst-fmon do-tst-rpmatch -tests: do-collate-test do-xfrm-test do-tst-fmon do-tst-rpmatch -do-collate-test: sort-test.sh $(objpfx)collate-test $(test-input) +.PHONY: do-collate-test do-tst-fmon do-tst-locale do-tst-rpmatch +tests: do-collate-test do-tst-fmon do-tst-locale do-tst-rpmatch +do-collate-test: sort-test.sh $(objpfx)collate-test $(objpfx)xfrm-test \ + $(test-input:.ISO-8859-1=.in) $(SHELL) -e $< $(common-objpfx) $(test-input) -do-xfrm-test: tst-fmon.sh $(objpfx)xfrm-test tst-fmon.data - $(SHELL) -e $< $(common-objpfx) tst-fmon.data do-tst-fmon: tst-locale.sh $(objpfx)tst-fmon $(ld-test-srcs) $(SHELL) -e $< $(common-objpfx) +do-tst-locale: tst-locale.sh + $(SHELL) -e $< $(common-objpfx) do-tst-rpmatch: tst-rpmatch.sh $(objpfx)tst-rpmatch $(SHELL) -e $< $(common-objpfx) endif |