X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=sim%2Fucsim%2FMakefile;h=f5854aa279c90820dcd0ec585d4472d7e0bb2c46;hb=bfd7431078b6d902b991d098798911bd612bf670;hp=ce162ff10d776f82369bf3b61ba55027318f398e;hpb=72b7e8dadd92279596c0f56649775fc056acf449;p=fw%2Fsdcc

diff --git a/sim/ucsim/Makefile b/sim/ucsim/Makefile
index ce162ff1..f5854aa2 100644
--- a/sim/ucsim/Makefile
+++ b/sim/ucsim/Makefile
@@ -89,9 +89,9 @@ realclean: distclean
 # ---------------------
 dist: distclean
 	@if [ -f devel ]; then\
-	  rm -f devel; mkdist ucsim; touch devel;\
+	  rm -f devel; mkdist; touch devel;\
 	else\
-	  mkdist ucsim;\
+	  mkdist;\
 	fi
 
 
@@ -152,7 +152,7 @@ print-newer:
 
 new_files:
 	diff -rNu $$HOME/clean-source/sdcc/sim/ucsim .|\
-	grep '^diff' | grep -v CVS | awk '{print $$4}'
+	grep '^diff' | grep -v "\.svn" | awk '{print $$4}'
 
 lines:
 	@find . \( -name '*.[ch]' -o -name '*.cc' -o -name '*.hh' \) \
@@ -163,22 +163,33 @@ lines:
 # ----------------------
 configure: configure.in
 	@$(PRJDIR)/mkecho $(PRJDIR) "RE-CREATING CONFIGURE"
-	$(SHELL) autoconf configure.in >configure
+	autoconf configure.in >configure
 	chmod 755 configure
 
 config.status: configure
-	@$(PRJDIR)/mkecho $(PRJDIR) "RE-CHECKING CONFIGURATION"
-	./config.status -recheck
+	@$(PRJDIR)/mkecho $(PRJDIR) "RE-CHECKING CONFIGURATION (re-creating config.status from configure)"
+	@if [ -x ./config.status ]; then \
+	  ./config.status -recheck;\
+	else\
+	  if [ -x ./conf ]; then\
+	    ./conf;\
+	  else\
+	    ./configure;\
+	  fi\
+	fi
 
 makefiles: config.status
 	@$(PRJDIR)/mkecho $(PRJDIR) "RE-MAKING MAKEFILES"
 	$(SHELL) ./config.status
 
-main.mk: $(srcdir)/main_in.mk $(srcdir)/configure.in
+main.mk: $(srcdir)/main_in.mk config.status
 	@$(PRJDIR)/mkecho $(PRJDIR) "RE-MAKING MAIN.MK"
 	$(SHELL) ./config.status
 
-freshconf: echo_freshconf configure main.mk
+freshconf: echo_freshconf configure main.mk ddconfig.h
+
+ddconfig.h: ddconfig_in.h config.status
+	$(SHELL) ./config.status
 
 echo_freshconf:
 	@$(PRJDIR)/mkecho $(PRJDIR) "FRESHCONF"