diff options
-rw-r--r-- | Doc/Makefile.in | 17 | ||||
-rw-r--r-- | Src/Makefile.in | 26 | ||||
-rw-r--r-- | Src/Makemod.in.in | 17 |
3 files changed, 44 insertions, 16 deletions
diff --git a/Doc/Makefile.in b/Doc/Makefile.in index 13e34c9b6..00728d9e8 100644 --- a/Doc/Makefile.in +++ b/Doc/Makefile.in @@ -37,10 +37,6 @@ INSTALL = @INSTALL@ @DEFS_MK@ -.PHONY: all everything install uninstall install.man uninstall.man \ - install.info uninstall.info install.html uninstall.html \ - clean-here distclean-here realclean-here - MAKEINFO = makeinfo TEXI2DVI = texi2dvi DVIPS = dvips -D 300 @@ -78,8 +74,10 @@ Zsh/seealso.yo Zsh/zftpsys.yo Zsh/zle.yo # ========== DEPENDENCIES FOR BUILDING ========== all: $(MAN) zsh.texi ../META-FAQ +.PHONY: all everything: all zsh.dvi zsh_us.ps zsh_a4.ps zsh_toc.html +.PHONY: everything zsh.dvi: zsh.texi $(TEXI2DVI) $(sdir)/zsh.texi @@ -212,9 +210,11 @@ Zsh/modmenu.yo: $(MODDOCSRC) # install just installs the manual pages install: install.man +.PHONY: install # uninstall just unistalls the manual pages uninstall: uninstall.man +.PHONY: uninstall # install man pages, creating install directory if necessary install.man: $(MAN) @@ -222,6 +222,7 @@ install.man: $(MAN) for file in $(MAN); do \ $(INSTALL_DATA) $(sdir)/$$file $(DESTDIR)$(mandir)/man1/`echo $$file | sed 's|zsh|$(tzsh)|'` || exit 1; \ done +.PHONY: install.man # install info pages, creating install directory if necessary install.info: zsh.texi @@ -242,17 +243,20 @@ install.info: zsh.texi rm -rf infodir; \ exit 1; \ fi +.PHONY: install.info # uninstall man pages uninstall.man: for file in $(MAN); do \ rm -f $(DESTDIR)$(mandir)/man1/`echo $$file | sed 's|zsh|$(tzsh)|'`; \ done +.PHONY: uninstall.man # uninstall info pages uninstall.info: rm -f $(DESTDIR)$(infodir)/$(tzsh).info rm -f $(DESTDIR)$(infodir)/$(tzsh).info-[1-9]* +.PHONY: uninstall.info # install HTML manual install.html: zsh_toc.html @@ -260,10 +264,12 @@ install.html: zsh_toc.html for file in zsh_*.html; do \ $(INSTALL_DATA) $$file $(DESTDIR)$(htmldir) || exit 1; \ done +.PHONY: install.html # uninstall HTML manual uninstall.html: rm -f $(DESTDIR)$(htmldir)/zsh_*.html +.PHONY: uninstall.html # ========== DEPENDENCIES FOR CLEANUP ========== @@ -272,13 +278,16 @@ clean-here: rm -f *.aux *.cp *.cps *.fn *.fns *.ky *.log rm -f *.pg *.pgs *.toc *.tp *.tps *.vr *.vrs rm -rf infodir +.PHONY: clean-here distclean-here: clean-here rm -f Makefile +.PHONY: distclean-here realclean-here: distclean-here cd $(sdir) && rm -f Zsh/modlist.yo Zsh/modmenu.yo cd $(sdir) && rm -f version.yo ../META-FAQ zsh.texi $(MAN) +.PHONY: realclean-here @CLEAN_MK@ diff --git a/Src/Makefile.in b/Src/Makefile.in index b4c8186d9..b79299413 100644 --- a/Src/Makefile.in +++ b/Src/Makefile.in @@ -39,12 +39,6 @@ LN = @LN@ @DEFS_MK@ -.PHONY: all bin headers modules modobjs modules prep rm-modobjs-tmp \ - FORCE mostlyclean-here clean-here distclean-here mostlyclean \ - clean distclean realclean mostlyclean-modules clean-modules \ - distclean-modules realclean-modules install.modules \ - uninstall.modules proto - sdir_src = $(sdir) dir_src = . @@ -54,10 +48,13 @@ LINK = $(CC) $(LDFLAGS) $(EXELDFLAGS) $(EXTRA_LDFLAGS) -o $@ DLLINK = $(DLLD) $(LDFLAGS) $(LIBLDFLAGS) $(DLLDFLAGS) -o $@ all: bin modules +.PHONY: all bin: zsh +.PHONY: bin modules: headers +.PHONY: modules MAIN_OBJS = main.o @@ -95,9 +92,11 @@ stamp-modobjs: modobjs fi modobjs: headers rm-modobjs-tmp +.PHONY: modobjs rm-modobjs-tmp: rm -f stamp-modobjs.tmp +.PHONY: rm-modobjs-tmp @CONFIG_MK@ @@ -121,8 +120,10 @@ Makemod modules.index prep: modules-bltin $(CONFIG_INCS) cd $(dir_top) && \ $(SHELL) $$top_srcdir/$(subdir)/mkmakemod.sh $(subdir) Makemod @$(MAKE) -f Makemod $(MAKEDEFS) prep || rm -f Makemod +.PHONY: prep FORCE: +.PHONY: FORCE # ========== LINKING IN MODULES ========== @@ -158,9 +159,11 @@ ansi2knr: ansi2knr.o install: install.bin install.modules uninstall: uninstall.bin uninstall.modules +.PHONY: install uninstall install.bin: install.bin-here uninstall.bin: uninstall.bin-here +.PHONY: install.bin uninstall.bin # install binary, creating install directory if necessary install.bin-here: zsh install.bin-@L@ @@ -173,19 +176,23 @@ install.bin-here: zsh install.bin-@L@ rm -f $(DESTDIR)$(bindir)/$(tzsh).new $(LN) $(DESTDIR)$(bindir)/$(tzsh)-$(VERSION) $(DESTDIR)$(bindir)/$(tzsh).new mv $(DESTDIR)$(bindir)/$(tzsh).new $(DESTDIR)$(bindir)/$(tzsh) +.PHONY: install.bin-here install.bin-N: install.bin-L: $(LIBZSH) $(sdir_top)/mkinstalldirs $(DESTDIR)$(libdir)/$(tzsh) $(INSTALL_PROGRAM) $(LIBZSH) $(DESTDIR)$(libdir)/$(tzsh)/$(LIBZSH) +.PHONY: install.bin-N install.bin-L # uninstall binary uninstall.bin-here: uninstall.bin-@L@ rm -f $(DESTDIR)$(bindir)/$(tzsh)-$(VERSION) $(DESTDIR)$(bindir)/$(tzsh) +.PHONY: uninstall.bin-here uninstall.bin-@L@ uninstall.bin-N: uninstall.bin-L: rm -f $(DESTDIR)$(libdir)/$(tzsh)/$(LIBZSH) +.PHONY: uninstall.bin-N uninstall.bin-L # ========== DEPENDENCIES FOR CLEANUP ========== @@ -195,20 +202,24 @@ uninstall.bin-L: mostlyclean-here: rm -f stamp-modobjs stamp-modobjs.tmp +.PHONY: mostlyclean-here clean-here: rm -f modules.index.tmp modules.stamp zsh ansi2knr.o ansi2knr rm -f modules.index modules-bltin rm -f libzsh-*.$(DL_EXT) +.PHONY: clean-here distclean-here: rm -f TAGS tags rm -f Makefile mymods.conf +.PHONY: distclean-here mostlyclean: mostlyclean-modules clean: clean-modules distclean: distclean-modules realclean: realclean-modules +.PHONY: mostlyclean clean distclean realclean # Don't remake Makemod just to delete things, even if it doesn't exist. mostlyclean-modules clean-modules distclean-modules realclean-modules: modules.index @@ -216,6 +227,8 @@ mostlyclean-modules clean-modules distclean-modules realclean-modules: modules.i $(MAKE) -f Makemod $(MAKEDEFS) `echo $@ | sed 's/-modules//'`; \ fi; \ exit 0 +.PHONY: mostlyclean-modules clean-modules distclean-modules \ + realclean-modules @CLEAN_MK@ @@ -224,5 +237,6 @@ mostlyclean-modules clean-modules distclean-modules realclean-modules: modules.i install.modules uninstall.modules \ modobjs modules headers proto $(MAIN_OBJS) zsh.export: Makemod @$(MAKE) -f Makemod $(MAKEDEFS) $@ +.PHONY: install.modules uninstall.modules $(MAIN_OBJS): $(sdir)/zsh.h diff --git a/Src/Makemod.in.in b/Src/Makemod.in.in index 4822452ed..0eb9e17ef 100644 --- a/Src/Makemod.in.in +++ b/Src/Makemod.in.in @@ -39,13 +39,7 @@ sdir_top = @top_srcdir@ INSTALL = @INSTALL@ @DEFS_MK@ - -.PHONY: all modobjs modules headers proto prep FORCE install uninstall \ - install.bin uninstall.bin install.modules uninstall.modules \ - install.bin-here uninstall.bin-here install.modules-here \ - uninstall.modules-here mostlyclean-here clean-here distclean-here \ - sdir_src = $(sdir_top)/Src dir_src = $(dir_top)/Src @@ -96,11 +90,13 @@ PROTODEPS = $(sdir_src)/makepro.awk # ========== DEPENDENCIES FOR BUILDING ========== all: modobjs modules +.PHONY: all modobjs: $(MODOBJS) modules: $(MODULES) headers: $(MDHS) proto: $(PROTOS) +.PHONY: modobjs modules headers proto prep: @case $(sdir_top) in \ @@ -116,25 +112,31 @@ prep: $(SHELL) $$top_srcdir/Src/mkmakemod.sh $$dir Makefile || exit 1; \ ( cd $$dir && $(MAKE) $(MAKEDEFS) $@ ) || exit 1; \ done +.PHONY: prep headers prep: $(dir_src)/modules.stamp $(dir_src)/modules.stamp: $(MDDS) echo 'timestamp for *.mdd files' > $@ +.PHONY: headers FORCE: +.PHONY: FORCE # ========== DEPENDENCIES FOR INSTALLING ========== install: install.bin install.modules uninstall: uninstall.bin uninstall.modules +.PHONY: install uninstall install.bin: install.bin-here uninstall.bin: uninstall.bin-here install.modules: install.modules-here uninstall.modules: uninstall.modules-here +.PHONY: install.bin uninstall.bin install.modules uninstall.modules install.bin-here uninstall.bin-here: install.modules-here uninstall.modules-here: +.PHONY: install.bin-here install.modules-here # ========== DEPENDENCIES FOR CLEANUP ========== @@ -142,12 +144,15 @@ install.modules-here uninstall.modules-here: mostlyclean-here: rm -f *.o *.export *.$(DL_EXT) +.PHONY: mostlyclean-here clean-here: rm -f *.o.c *.syms *.pro *.epro *.mdh *.mdhi *.mdhs *.mdh.tmp +.PHONY: clean-here distclean-here: rm -f $(makefile) $(makefile).in +.PHONY: distclean-here # ========== RECURSIVE MAKES ========== |