X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=sim%2Fucsim%2FMakefile;h=b5c0278adc02a7b7c5cd6434fc399acd1a0ef262;hb=f27da39dbcab5678aca6d8462f1cc37a643f37e9;hp=d59300c1053b3edb8ce5edc062b462dbc13af477;hpb=f27cbdc6513b26748661452e50ed3af99fac16a2;p=fw%2Fsdcc

diff --git a/sim/ucsim/Makefile b/sim/ucsim/Makefile
index d59300c1..b5c0278a 100644
--- a/sim/ucsim/Makefile
+++ b/sim/ucsim/Makefile
@@ -9,7 +9,8 @@ STARTYEAR	= 1997
 SHELL		= /bin/sh
 
 PRJDIR		= .
-PKGS		= cmd.src sim.src gui.src s51.src avr.src z80.src doc
+include packages.mk
+#PKGS		= cmd.src sim.src gui.src s51.src avr.src z80.src doc
 
 srcdir          = .
 
@@ -21,6 +22,7 @@ all: checkconf
 	@for pkg in $(PKGS); do\
 	  cd $$pkg && $(MAKE) $$pkg ; cd ..;\
 	done
+	$(MAKE) -f main.mk main_app
 
 libs: main.mk
 	$(MAKE) -f main.mk libs
@@ -48,9 +50,9 @@ uninstall:
 # Deleting all files created by building the program
 # --------------------------------------------------
 clean:
-	$(MAKE) -f clean.mk clean
+	$(MAKE) -f clean.mk clean EXEEXT=$(EXEEXT)
 	@for pkg in $(PKGS); do\
-	  $(MAKE) -C $$pkg -f clean.mk clean ;\
+	  $(MAKE) -C $$pkg -f clean.mk clean EXEEXT=$(EXEEXT) ;\
 	done
 
 
@@ -87,15 +89,25 @@ 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
 
 
 # Performing self-test
 # --------------------
 check:
+	$(MAKE) -f main.mk check
+	@for pkg in $(PKGS); do\
+	  $(MAKE) -C $$pkg check ;\
+	done
+
+test:
+	$(MAKE) -f main.mk test
+	@for pkg in $(PKGS); do\
+	  $(MAKE) -C $$pkg test ;\
+	done
 
 
 # Performing installation test
@@ -150,29 +162,40 @@ lines:
 # Remaking configuration
 # ----------------------
 configure: configure.in
-	@echo "RE-CREATING CONFIGURE"
-	$(SHELL) autoconf configure.in >configure
+	@$(PRJDIR)/mkecho $(PRJDIR) "RE-CREATING CONFIGURE"
+	autoconf configure.in >configure
 	chmod 755 configure
 
 config.status: configure
-	@echo "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
-	@echo "RE-MAKING MAKEFILES"
+	@$(PRJDIR)/mkecho $(PRJDIR) "RE-MAKING MAKEFILES"
 	$(SHELL) ./config.status
 
-main.mk: $(srcdir)/main_in.mk $(srcdir)/configure.in
-	@echo "RE-MAKING MAIN.MK"
+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:
-	@echo "FRESHCONF"
+	@$(PRJDIR)/mkecho $(PRJDIR) "FRESHCONF"
 
 checkconf:
-	@echo "CHECKCONF"
+	@$(PRJDIR)/mkecho $(PRJDIR) "CHECKCONF"
 	@if [ -f devel ]; then $(MAKE) freshconf; fi
 
 # End of Makefile