diff --git a/config/RULES.Unix b/config/RULES.Unix index d67c13e6e..c683a23fe 100644 --- a/config/RULES.Unix +++ b/config/RULES.Unix @@ -23,6 +23,8 @@ all:: install pre_build:: +rebuild:: clean install + build:: pre_build $(LIBNAME) $(TARGETS) $(PROD) inc:: $(INSTALL_INC) @@ -252,7 +254,7 @@ $(INSTALL_TEMPLATES)/$(TEMPLATES_DIR)/%: % .PRECIOUS: %.o %.c -.PHONY: all inc depends build install pre-build clean +.PHONY: all inc depends build install pre-build clean rebuild -include .DEPENDS diff --git a/config/RULES.Vx b/config/RULES.Vx index 5f17fabee..9d9bc3664 100644 --- a/config/RULES.Vx +++ b/config/RULES.Vx @@ -27,6 +27,8 @@ INSTALL_DBDNAME=$(DBDNAME:%=$(INSTALL_DBD)/%) all:: install +rebuild:: clean install + pre_build:: build:: pre_build $(MENUS) $(RECTYPES) $(BPTS)\ @@ -90,20 +92,20 @@ clean:: $(YACC) $(YACCOPT) $< @if [ -f y.tab.c ]; \ then \ - echo "/bin/mv y.tab.c $*.c"; \ - /bin/mv y.tab.c $*.c; \ + echo "$(MV) y.tab.c $*.c"; \ + $(MV) y.tab.c $*.c; \ fi @if [ -f y.tab.h ]; \ then \ - echo "/bin/mv y.tab.h $*.h"; \ - /bin/mv y.tab.h $*.h; \ + echo "$(MV) y.tab.h $*.h"; \ + $(MV) y.tab.h $*.h; \ fi %.c: ../%.l $(RM) lex.yy.c $(LEX) $(LEXOPT) $< $(RM) $@ - /bin/mv lex.yy.c $@ + $(MV) lex.yy.c $@ #state notation language rules %.c: ../%.st @@ -254,7 +256,7 @@ $(INSTALL_DOC)/%: ../% .PRECIOUS: %.o %.c -.PHONY: all inc depends build install pre-build clean +.PHONY: all inc depends build install pre-build clean rebuild -include .DEPENDS diff --git a/config/RULES_ARCHS b/config/RULES_ARCHS index 325bc53c8..348f787e8 100644 --- a/config/RULES_ARCHS +++ b/config/RULES_ARCHS @@ -11,6 +11,7 @@ ACTIONS += inc ACTIONS += build ACTIONS += install ACTIONS += depends +ACTIONS += rebuild actionPart = $(word 1, $(subst $(DIVIDER), ,$@)) archPart = $(word 2, $(subst $(DIVIDER), ,$@)) diff --git a/config/RULES_DIRS b/config/RULES_DIRS index 5db4f8d6f..7490b90cc 100644 --- a/config/RULES_DIRS +++ b/config/RULES_DIRS @@ -26,7 +26,7 @@ actionArchTargets = $(foreach action, $(ACTIONS),\ all:: inc install -rebuild:: clean uninstall all +rebuild:: clean all $(DIRS) $(dirActionTargets) $(dirArchTargets)$(dirActionArchTargets) :: $(MAKE) -C $(dirPart) $(actionArchPart)