X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=sim%2Fucsim%2Fs51.src%2FMakefile.in;h=89a45c9e3d5648978a50f1c93322a3c31a13f08d;hb=72b7e8dadd92279596c0f56649775fc056acf449;hp=10be85e8ee52b49440f22d2a4d326280abf1ff7f;hpb=8c8f34ff4281a55d2f535335c02999246e9e12f2;p=fw%2Fsdcc

diff --git a/sim/ucsim/s51.src/Makefile.in b/sim/ucsim/s51.src/Makefile.in
index 10be85e8..89a45c9e 100644
--- a/sim/ucsim/s51.src/Makefile.in
+++ b/sim/ucsim/s51.src/Makefile.in
@@ -29,7 +29,7 @@ SDCC		= sdcc
 SDCFLAGS	= --debug --stack-after-data --model-small
 SDCPPFLAGS	= 
 
-LIBS		= @LIBS@ -L$(PRJDIR) -lsim -lcmd -lguiucsim -lutil
+LIBS		= @LIBS@ -L$(PRJDIR) -lsim -lutil -lsim -lcmd -lguiucsim
 DL		= @DL@
 dl_ok		= @dl_ok@
 
@@ -45,6 +45,8 @@ man2dir         = $(mandir)/man2
 infodir         = @infodir@
 srcdir          = @srcdir@
 
+EXEEXT          = @EXEEXT@
+
 OBJECTS_SHARED	= glob.o sim51.o \
 		  inc.o jmp.o mov.o logic.o arith.o bit.o \
 		  timer0.o timer1.o timer2.o serial.o port.o interrupt.o \
@@ -66,14 +68,13 @@ all: checkconf otherlibs s51.src
 # Compiling and installing everything and runing test
 # ---------------------------------------------------
 install: all installdirs
-	if test -f s51.exe; then $(INSTALL) -s s51.exe $(bindir); $(STRIP) $(bindir)/s51.exe; fi
-	if test -f s51; then $(INSTALL) -s s51 $(bindir); $(STRIP) $(bindir)/s51; fi
+	$(INSTALL) -s s51$(EXEEXT) $(bindir)
 
 
 # Deleting all the installed files
 # --------------------------------
 uninstall:
-	rm -f $(bindir)/s51
+	rm -f $(bindir)/s51$(EXEEXT)
 
 
 # Performing self-test
@@ -114,21 +115,21 @@ include clean.mk
 # --------
 .SUFFIXES: .rel
 
-s51.src: s51 shared_lib
+s51.src: s51$(EXEEXT) shared_lib
 
-s51: $(OBJECTS) $(PRJDIR)/*.a
-	$(CXX) $(CXXFLAGS) $(OBJECTS) $(LIBS) -o s51
+s51$(EXEEXT): $(OBJECTS) $(PRJDIR)/*.a
+	$(CXX) $(CXXFLAGS) $(OBJECTS) $(LIBS) -o $@
 
 ifeq ($(dlso_ok),yes)
 shared_lib: $(PRJDIR)/s51.so
 else
 shared_lib:
-	@echo "No 51 shared lib made."
-	@echo "(SHAREDLIB="$(SHAREDLIB)",dl_ok="$(dl_ok)",enable_dlso="$(enable_dlso)")"
+	@$(PRJDIR)/mkecho $(PRJDIR) "No 51 shared lib made."
+	@$(PRJDIR)/mkecho $(PRJDIR) "(SHAREDLIB="$(SHAREDLIB)",dl_ok="$(dl_ok)",enable_dlso="$(enable_dlso)")"
 endif
 
 $(PRJDIR)/s51.so: $(OBJECTS_SHARED)
-	$(CXX) -shared $(OBJECTS_SHARED) -o $(PRJDIR)/s51.so
+	$(CXX) -shared $(OBJECTS_SHARED) -o $@
 
 otherlibs:
 	cd $(PRJDIR)/cmd.src && $(MAKE) all