app.cc appcl.h option.cc optioncl.h moved to parent directory

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

diff --git a/sim/ucsim/main_in.mk b/sim/ucsim/main_in.mk
index 1a1de04992b8ffcb97867b8c64453e549a2a1514..7d47fb8542680ce18df74f36ca556fa4eca34bd9 100644 (file)
--- a/sim/ucsim/main_in.mk
+++ b/sim/ucsim/main_in.mk
@@ -15,10 +15,13 @@ 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@
@@ -39,12 +42,14 @@ man2dir         = $(mandir)/man2
 infodir         = @infodir@
 srcdir          = @srcdir@
 
-OBJECTS         = pobj.o globals.o utils.o
+OBJECTS         = pobj.o globals.o utils.o error.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
 # ------------------------------------------
@@ -72,6 +77,7 @@ uninstall:
 # --------------------
 check:
 
+test:
 
 # Performing installation test
 # ----------------------------
@@ -103,7 +109,12 @@ 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)
        echo $(UCSIM_LIB_FILES)