* sim/ucsim/avr.src/Makefile.in, sim/ucsim/hc08.src/Makefile.in,

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

diff --git a/sim/ucsim/main_in.mk b/sim/ucsim/main_in.mk
index 11ec6e32fd0aedaa69b1b07bb29658d0e82494a3..ea45c8eda03317cc070a31aeca20edd958b7d118 100644 (file)
--- a/sim/ucsim/main_in.mk
+++ b/sim/ucsim/main_in.mk
@@ -21,7 +21,7 @@ GUIDIR                = gui.src
 
 DEFS            = $(subs -DHAVE_CONFIG_H,,@DEFS@)
 # FIXME: -Imcs51 must be removed!!!
-CPPFLAGS        = @CPPFLAGS@ -I$(top_builddir). -I$(srcdir) \
+CPPFLAGS        = @CPPFLAGS@ -I$(top_builddir) -I$(srcdir) \
                   -I$(top_srcdir)/$(SIMDIR) \
                  -I$(top_srcdir)/$(CMDDIR) -I$(top_srcdir)/$(GUIDIR)
 CFLAGS          = @CFLAGS@ -I$(top_builddir) -Wall
@@ -30,7 +30,7 @@ M_OR_MM         = @M_OR_MM@
 
 EXEEXT         = @EXEEXT@
 
-LIB_LIST       = util cmd sim
+LIB_LIST       = ucsimutil cmd sim
 UCSIM_LIBS     = -Wl,--start-group $(patsubst %,-l%,$(LIB_LIST)) -Wl,--end-group
 UCSIM_LIB_FILES        = $(patsubst %,lib%.a,$(LIB_LIST))
 
@@ -39,6 +39,7 @@ exec_prefix     = @exec_prefix@
 bindir          = @bindir@
 libdir          = @libdir@
 datadir         = @datadir@
+datarootdir     = @datarootdir@
 includedir      = @includedir@
 mandir          = @mandir@
 man1dir         = $(mandir)/man1
@@ -60,7 +61,7 @@ enable_ucsim  = @enable_ucsim@
 # ------------------------------------------
 all: checkconf libs
 
-libs: libutil.a
+libs: libucsimutil.a
 
 main_app: checkconf ucsim_app
 
@@ -101,7 +102,7 @@ dep: main.dep
 main.dep: $(ALL_SOURCES) *.h $(srcdir)/*.h
        $(CXXCPP) $(CPPFLAGS) $(M_OR_MM) $(filter %.cc,$^) >main.dep
 
-include main.dep
+-include main.dep
 include $(srcdir)/clean.mk
 
 #parser.cc: parser.y
@@ -110,7 +111,7 @@ include $(srcdir)/clean.mk
 
 # My rules
 # --------
-libutil.a: $(OBJECTS)
+libucsimutil.a: $(OBJECTS)
        ar -rcu $*.a $(OBJECTS)
        $(RANLIB) $*.a