Merge branch ucsim-034-pre3 to main trunk; new version 0.4

[fw/sdcc] / sim / ucsim / s51.src / Makefile.in

diff --git a/sim/ucsim/s51.src/Makefile.in b/sim/ucsim/s51.src/Makefile.in
index 2588ff2d9e8a63ae72530173edfa462e721c69fc..10be85e8ee52b49440f22d2a4d326280abf1ff7f 100644 (file)
--- a/sim/ucsim/s51.src/Makefile.in
+++ b/sim/ucsim/s51.src/Makefile.in
@@ -31,7 +31,6 @@ SDCPPFLAGS    =
 
 LIBS           = @LIBS@ -L$(PRJDIR) -lsim -lcmd -lguiucsim -lutil
 DL             = @DL@
-
 dl_ok          = @dl_ok@
 
 prefix          = @prefix@
@@ -49,26 +48,26 @@ srcdir          = @srcdir@
 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 \
-                 uc51.o uc52.o uc51r.o uc89c51r.o uc251.o uc390.o
+                 wdt.o pca.o \
+                 uc51.o uc52.o uc51r.o uc89c51r.o uc251.o \
+                 uc390.o uc390hw.o
 OBJECTS_EXE    = s51.o 
 OBJECTS                = $(OBJECTS_SHARED) $(OBJECTS_EXE)
 
+enable_dlso    = @enable_dlso@
+dlso_ok                = @dlso_ok@
+
 
 # Compiling entire program or any subproject
 # ------------------------------------------
 all: checkconf otherlibs s51.src
 
-tests: test_ser.ihx
-
-test_ser.ihx: test_ser.rel
-       $(SDCC) $(SDCFLAGS) $<
-
 
 # Compiling and installing everything and runing test
 # ---------------------------------------------------
 install: all installdirs
-       if test -f s51.exe; then $(INSTALL) s51.exe $(bindir); $(STRIP) $(bindir)/s51.exe; fi
-       if test -f s51; then $(INSTALL) s51 $(bindir); $(STRIP) $(bindir)/s51; fi
+       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
 
 
 # Deleting all the installed files
@@ -79,8 +78,12 @@ uninstall:
 
 # Performing self-test
 # --------------------
-check:
+check: test
+
+test: test_ser.ihx
 
+test_ser.ihx: test_ser.rel
+       $(SDCC) $(SDCFLAGS) $<
 
 # Performing installation test
 # ----------------------------
@@ -114,13 +117,14 @@ include clean.mk
 s51.src: s51 shared_lib
 
 s51: $(OBJECTS) $(PRJDIR)/*.a
-       $(CXX) $(CXXFLAGS) -o s51 $(OBJECTS) $(LIBS)
+       $(CXX) $(CXXFLAGS) $(OBJECTS) $(LIBS) -o s51
 
-ifeq ($(SHAREDLIB),yes)
+ifeq ($(dlso_ok),yes)
 shared_lib: $(PRJDIR)/s51.so
 else
 shared_lib:
-       @echo "No shared lib made."
+       @echo "No 51 shared lib made."
+       @echo "(SHAREDLIB="$(SHAREDLIB)",dl_ok="$(dl_ok)",enable_dlso="$(enable_dlso)")"
 endif
 
 $(PRJDIR)/s51.so: $(OBJECTS_SHARED)