EXEEXT introduces to solve Cygwin problems

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

diff --git a/sim/ucsim/avr.src/Makefile.in b/sim/ucsim/avr.src/Makefile.in
index 775edcaa9a9ad8c9ebbd50e179300b57955d767f..57cbf209b9b096834e927e8ca41ff9a70bbff6f0 100644 (file)
--- a/sim/ucsim/avr.src/Makefile.in
+++ b/sim/ucsim/avr.src/Makefile.in
@@ -17,12 +17,18 @@ 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@
 
-LIBS           = @LIBS@ -L$(PRJDIR) -lsim -lcmd -lutil
+EXEEXT          = @EXEEXT@
+
+LIBS           = @LIBS@ -L$(PRJDIR) -lsim -lutil -lsim -lcmd -lguiucsim
+DL             = @DL@
+dl_ok          = @dl_ok@
 
 prefix          = @prefix@
 exec_prefix     = @exec_prefix@
@@ -36,38 +42,43 @@ man2dir         = $(mandir)/man2
 infodir         = @infodir@
 srcdir          = @srcdir@
 
-OBJECTS         = savr.o glob.o \
+OBJECTS_SHARED = glob.o \
                  simavr.o avr.o port.o \
                  inst.o bit_inst.o jump_inst.o move_inst.o logic_inst.o \
                  arith_inst.o
+OBJECTS_EXE    = savr.o
+OBJECTS                = $(OBJECTS_SHARED) $(OBJECTS_EXE)
+
+enable_dlso    = @enable_dlso@
+dlso_ok                = @dlso_ok@
 
 AVRASM         = tavrasm
 TEST_OBJ       = test_bit.hex test_dis.hex test_mov.hex test_jmp.hex \
-                 test_arith.hex
+                 test_arith.hex test_call.hex
 
 
 # Compiling entire program or any subproject
 # ------------------------------------------
-all: checkconf otherlibs avr.src tests
-
-tests: $(TEST_OBJ)
+all: checkconf otherlibs avr.src
 
 
 # Compiling and installing everything and runing test
 # ---------------------------------------------------
 install: all installdirs
-       $(INSTALL) -s savr $(bindir)
+       $(INSTALL) -s savr$(EXEEXT) $(bindir)
 
 
 # Deleting all the installed files
 # --------------------------------
 uninstall:
-       rm -f $(bindir)/savr
+       rm -f $(bindir)/savr$(EXEEXT)
 
 
 # Performing self-test
 # --------------------
-check:
+check: $(TEST_OBJ)
+
+test:
 
 
 # Performing installation test
@@ -99,10 +110,21 @@ include clean.mk
 # --------
 .SUFFIXES: .asm .hex
 
-avr.src: savr
+avr.src: savr$(EXEEXT) shared_lib
+
+savr$(EXEEXT): $(OBJECTS) $(PRJDIR)/*.a
+       $(CXX) $(CXXFLAGS) $(OBJECTS) $(LIBS) -o $@
+
+ifeq ($(dlso_ok),yes)
+shared_lib: $(PRJDIR)/savr.so
+else
+shared_lib:
+       @$(PRJDIR)/mkecho $(PRJDIR) "No AVR shared lib made."
+       @$(PRJDIR)/mkecho $(PRJDIR) "(SHAREDLIB="$(SHAREDLIB)",dl_ok="$(dl_ok)",enable_dlso="$(enable_dlso)")"
+endif
 
-savr: $(OBJECTS) $(PRJDIR)/*.a
-       $(CXX) $(CXXFLAGS) -o savr $(OBJECTS) $(LIBS)
+$(PRJDIR)/savr.so: $(OBJECTS_SHARED)
+       $(CXX) -shared $(OBJECTS_SHARED) -o $(PRJDIR)/savr.so
 
 otherlibs:
        cd $(PRJDIR)/cmd.src && $(MAKE) all