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

diff --git a/sim/ucsim/s51.src/Makefile.in b/sim/ucsim/s51.src/Makefile.in
index f0e52e09..89a45c9e 100644
--- a/sim/ucsim/s51.src/Makefile.in
+++ b/sim/ucsim/s51.src/Makefile.in
@@ -12,21 +12,26 @@ CPP		= @CPP@
 CXXCPP		= @CXXCPP@
 RANLIB		= @RANLIB@
 INSTALL		= @INSTALL@
+STRIP		= @STRIP@
 
 PRJDIR		= ..
 
 DEFS            = $(subs -DHAVE_CONFIG_H,,@DEFS@)
 CPPFLAGS        = @CPPFLAGS@ -I. -I$(PRJDIR) \
-		  -I$(PRJDIR)/cmd.src -I$(PRJDIR)/sim.src
+		  -I$(PRJDIR)/cmd.src -I$(PRJDIR)/sim.src -I$(PRJDIR)/gui.src
 CFLAGS          = @CFLAGS@ -Wall
 CXXFLAGS        = @CXXFLAGS@ -Wall
 M_OR_MM         = @M_OR_MM@
+PICOPT		= @PICOPT@
+SHAREDLIB	= @SHAREDLIB@
 
 SDCC		= sdcc
 SDCFLAGS	= --debug --stack-after-data --model-small
 SDCPPFLAGS	= 
 
-LIBS		= @LIBS@ -L$(PRJDIR) -lutil -lsim -lcmd
+LIBS		= @LIBS@ -L$(PRJDIR) -lsim -lutil -lsim -lcmd -lguiucsim
+DL		= @DL@
+dl_ok		= @dl_ok@
 
 prefix          = @prefix@
 exec_prefix     = @exec_prefix@
@@ -40,39 +45,46 @@ man2dir         = $(mandir)/man2
 infodir         = @infodir@
 srcdir          = @srcdir@
 
-OBJECTS         = s51.o glob.o sim51.o cmd51.o \
+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 \
+		  wdt.o pca.o \
 		  uc51.o uc52.o uc51r.o uc89c51r.o uc251.o \
-		  cmd.o dump.o go.o cmd_brk.o set.o where.o show.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
-
-tests: test_ser.ihx
-
-test_ser.ihx: test_ser.rel
-	$(SDCC) $(SDCFLAGS) $<
+all: checkconf otherlibs s51.src
 
 
 # Compiling and installing everything and runing test
 # ---------------------------------------------------
 install: all installdirs
-	$(INSTALL) -s s51 $(bindir)
+	$(INSTALL) -s s51$(EXEEXT) $(bindir)
 
 
 # Deleting all the installed files
 # --------------------------------
 uninstall:
-	rm -f $(bindir)/s51
+	rm -f $(bindir)/s51$(EXEEXT)
 
 
 # Performing self-test
 # --------------------
-check:
+check: test
 
+test: test_ser.ihx
+
+test_ser.ihx: test_ser.rel
+	$(SDCC) $(SDCFLAGS) $<
 
 # Performing installation test
 # ----------------------------
@@ -103,17 +115,29 @@ include clean.mk
 # --------
 .SUFFIXES: .rel
 
-s51.src: s51
+s51.src: s51$(EXEEXT) shared_lib
+
+s51$(EXEEXT): $(OBJECTS) $(PRJDIR)/*.a
+	$(CXX) $(CXXFLAGS) $(OBJECTS) $(LIBS) -o $@
+
+ifeq ($(dlso_ok),yes)
+shared_lib: $(PRJDIR)/s51.so
+else
+shared_lib:
+	@$(PRJDIR)/mkecho $(PRJDIR) "No 51 shared lib made."
+	@$(PRJDIR)/mkecho $(PRJDIR) "(SHAREDLIB="$(SHAREDLIB)",dl_ok="$(dl_ok)",enable_dlso="$(enable_dlso)")"
+endif
 
-s51: $(OBJECTS) $(PRJDIR)/*.a
-	$(CXX) $(CXXFLAGS) -o s51 $(OBJECTS) $(LIBS)
+$(PRJDIR)/s51.so: $(OBJECTS_SHARED)
+	$(CXX) -shared $(OBJECTS_SHARED) -o $@
 
 otherlibs:
 	cd $(PRJDIR)/cmd.src && $(MAKE) all
 	cd $(PRJDIR)/sim.src && $(MAKE) all
+	$(MAKE) -C $(PRJDIR)/gui.src checkconf ucsim_lib
 
 .cc.o:
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $< -o $@
+	$(CXX) $(CXXFLAGS) $(PICOPT) $(CPPFLAGS) -c $< -o $@
 
 .c.rel:
 	$(SDCC) $(SDCFLAGS) $(SDCPPFLAGS) -c $<