EXEEXT introduces to solve Cygwin problems

[fw/sdcc] / sim / ucsim / main_in.mk

diff --git a/sim/ucsim/main_in.mk b/sim/ucsim/main_in.mk
index 6abe0993e78452adfeeafea3a3ffb50c7a5994bf..413f4dbe2f0b6a5b90e76d5d51a7bfe325507e2e 100644 (file)
--- a/sim/ucsim/main_in.mk
+++ b/sim/ucsim/main_in.mk
@@ -15,18 +15,22 @@ INSTALL             = @INSTALL@
 
 PRJDIR         = .
 SIMDIR         = sim.src
+CMDDIR         = cmd.src
+GUIDIR         = gui.src
 
 DEFS            = $(subs -DHAVE_CONFIG_H,,@DEFS@)
 # FIXME: -Imcs51 must be removed!!!
-CPPFLAGS        = @CPPFLAGS@ -I$(PRJDIR) -I$(PRJDIR)/$(SIMDIR)
+CPPFLAGS        = @CPPFLAGS@ -I$(PRJDIR) -I$(PRJDIR)/$(SIMDIR) \
+                 -I$(CMDDIR) -I$(GUIDIR)
 CFLAGS          = @CFLAGS@ -I$(PRJDIR) -Wall
 CXXFLAGS        = @CXXFLAGS@ -I$(PRJDIR) -Wall
 M_OR_MM         = @M_OR_MM@
 
-LIB_LIST       = sim cmd sim util
+EXEEXT          = @EXEEXT@
+
+LIB_LIST       = util sim cmd sim
 UCSIM_LIBS     = $(patsubst %,-l%,$(LIB_LIST))
 UCSIM_LIB_FILES        = $(patsubst %,lib%.a,$(LIB_LIST))
-LIBS           = @LIBS@
 
 prefix          = @prefix@
 exec_prefix     = @exec_prefix@
@@ -40,12 +44,14 @@ man2dir         = $(mandir)/man2
 infodir         = @infodir@
 srcdir          = @srcdir@
 
-OBJECTS         = pobj.o globals.o utils.o
+OBJECTS         = pobj.o globals.o utils.o error.o app.o option.o
 SOURCES                = $(patsubst %.o,%.cc,$(OBJECTS))
 UCSIM_OBJECTS  = ucsim.o
 UCSIM_SOURCES  = $(patsubst %.o,%.cc,$(UCSIM_OBJECTS))
 ALL_SOURCES    = $(SOURCES) $(UCSIM_SOURCES)
 
+enable_ucsim   = @enable_ucsim@
+
 
 # Compiling entire program or any subproject
 # ------------------------------------------
@@ -63,16 +69,17 @@ install: all installdirs
 # Deleting all the installed files
 # --------------------------------
 uninstall:
-       rm -f $(bindir)/s51
-       rm -f $(bindir)/savr
-       rm -f $(bindir)/serialview
-       rm -f $(bindir)/portmon
+       rm -f $(bindir)/s51$(EXEEXT)
+       rm -f $(bindir)/savr$(EXEEXT)
+       rm -f $(bindir)/serialview$(EXEEXT)
+       rm -f $(bindir)/portmon$(EXEEXT)
 
 
 # Performing self-test
 # --------------------
 check:
 
+test:
 
 # Performing installation test
 # ----------------------------
@@ -104,10 +111,16 @@ libutil.a: $(OBJECTS)
        ar -rcu $*.a $(OBJECTS)
        $(RANLIB) $*.a
 
+
+ifeq ($(enable_ucsim),yes)
 ucsim_app: libs ucsim
+else
+ucsim_app:
+endif
 
 ucsim: $(UCSIM_OBJECTS) $(UCSIM_LIB_FILES)
-       $(CXX) $(CXXFLAGS) -o $@ $< -L$(PRJDIR) $(UCSIM_LIBS) $(LIBS)
+       echo $(UCSIM_LIB_FILES)
+       $(CXX) $(CXXFLAGS) -o $@ $< -L$(PRJDIR) $(UCSIM_LIBS)
 
 .cc.o:
        $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c $< -o $@
@@ -127,7 +140,7 @@ ucsim: $(UCSIM_OBJECTS) $(UCSIM_LIB_FILES)
 # ----------------------
 checkconf:
        @if [ -f devel ]; then\
-         echo "MAIN.MK checkconf";\
+         $(PRJDIR)/mkecho $(PRJDIR) "MAIN.MK checkconf";\
          $(MAKE) -f conf.mk srcdir="$(srcdir)" freshconf;\
        fi