X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=sim%2Fucsim%2Fz80.src%2FMakefile.in;h=2f5077994cab30d071146aa820829ef304606318;hb=f1c40004ae349f7cd3a1a5c5c85f62f695196370;hp=1c8680d56dd9a38ab5026bc068106b3d7b062fd8;hpb=0e1bba0730e55b3d40c1c644d94befc99c87270d;p=fw%2Fsdcc

diff --git a/sim/ucsim/z80.src/Makefile.in b/sim/ucsim/z80.src/Makefile.in
index 1c8680d5..2f507799 100644
--- a/sim/ucsim/z80.src/Makefile.in
+++ b/sim/ucsim/z80.src/Makefile.in
@@ -23,8 +23,10 @@ CXXFLAGS        = @CXXFLAGS@ -Wall
 M_OR_MM         = @M_OR_MM@
 PICOPT		= @PICOPT@
 SHAREDLIB	= @SHAREDLIB@
+EXEEXT		= @EXEEXT@
+
+LIBS		= @LIBS@ -L$(PRJDIR) -Wl,--start-group -lutil -lcmd -lsim -lguiucsim -Wl,--end-group
 
-LIBS		= @LIBS@ -L$(PRJDIR) -lutil -lsim -lutil -lcmd -lguiucsim
 DL		= @DL@
 dl_ok		= @dl_ok@
 
@@ -70,13 +72,13 @@ tests: $(TEST_OBJ)
 # Compiling and installing everything and runing test
 # ---------------------------------------------------
 install: all installdirs
-	$(INSTALL) -s sz80 $(bindir)
+	$(INSTALL) -s sz80$(EXEEXT) $(DESTDIR)$(bindir)
 
 
 # Deleting all the installed files
 # --------------------------------
 uninstall:
-	rm -f $(bindir)/sz80
+	rm -f $(DESTDIR)$(bindir)/sz80$(EXEEXT)
 
 
 # Performing self-test
@@ -94,7 +96,7 @@ installcheck:
 # Creating installation directories
 # ---------------------------------
 installdirs:
-	test -d $(bindir) || $(INSTALL) -d $(bindir)
+	test -d $(DESTDIR)$(bindir) || $(INSTALL) -d $(DESTDIR)$(bindir)
 
 
 # Creating dependencies
@@ -111,17 +113,17 @@ include clean.mk
 # --------
 .SUFFIXES: .asm .hex
 
-z80.src: sz80  shared_lib
+z80.src: sz80$(EXEEXT) shared_lib
 
-sz80: $(OBJECTS) $(PRJDIR)/*.a
-	$(CXX) $(CXXFLAGS) -o sz80 $(OBJECTS) $(LIBS)
+sz80$(EXEEXT): $(OBJECTS) $(PRJDIR)/*.a
+	$(CXX) $(CXXFLAGS) -o $@ $(OBJECTS) $(LIBS)
 
 ifeq ($(dlso_ok),yes)
 shared_lib: $(PRJDIR)/sz80.so
 else
 shared_lib:
-	@echo "No z80 shared lib made."
-	@echo "(SHAREDLIB="$(SHAREDLIB)",dl_ok="$(dl_ok)",enable_dlso="$(enable_dlso)")"
+	@$(PRJDIR)/mkecho $(PRJDIR) "No z80 shared lib made."
+	@$(PRJDIR)/mkecho $(PRJDIR) "(SHAREDLIB="$(SHAREDLIB)",dl_ok="$(dl_ok)",enable_dlso="$(enable_dlso)")"
 endif
 
 $(PRJDIR)/sz80.so: $(OBJECTS_SHARED)