X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=sim%2Fucsim%2Fsim.src%2FMakefile.in;h=0a420a2fed5c277b6dcab760816fa2a4fe322f0a;hb=2738d56c6c0b57108f9f1bb7bb5449c84fcaefda;hp=2be834c52c9c2cab01999d257b5480c58d853ffc;hpb=c42e9051755428d14eb620abc9eda86d43479a1a;p=fw%2Fsdcc

diff --git a/sim/ucsim/sim.src/Makefile.in b/sim/ucsim/sim.src/Makefile.in
index 2be834c5..0a420a2f 100644
--- a/sim/ucsim/sim.src/Makefile.in
+++ b/sim/ucsim/sim.src/Makefile.in
@@ -28,6 +28,7 @@ exec_prefix     = @exec_prefix@
 bindir          = @bindir@
 libdir          = @libdir@
 datadir         = @datadir@
+datarootdir     = @datarootdir@
 includedir      = @includedir@
 mandir          = @mandir@
 man1dir         = $(mandir)/man1
@@ -44,8 +45,8 @@ OBJECTS         = stack.o mem.o sim.o itsrc.o brk.o arg.o \
 # ------------------------------------------
 all: checkconf sim_lib
 
-test_mem_speed: $(top_builddir)lib*.a test_mem_speed.o
-	$(CXX) -o $@ test_mem_speed.o -L$(top_builddir) -Wl,--start-group -lsim -lutil -lcmd -Wl,--end-group
+test_mem_speed: $(top_builddir)/lib*.a test_mem_speed.o
+	$(CXX) -o $@ test_mem_speed.o -L$(top_builddir) -Wl,--start-group -lsim -lucsimutil -lcmd -Wl,--end-group
 
 sim.src: all
 
@@ -82,9 +83,9 @@ installdirs:
 dep: main.dep
 
 Makefile.dep: $(srcdir)/*.cc $(srcdir)/*.h
-	$(CXXCPP) $(CPPFLAGS) $(M_OR_MM) $^ >Makefile.dep
+	$(CXXCPP) $(CPPFLAGS) $(M_OR_MM) $(filter %.cc,$^) >Makefile.dep
 
-include Makefile.dep
+-include Makefile.dep
 include $(srcdir)/clean.mk
 
 #parser.cc: parser.y
@@ -94,9 +95,9 @@ include $(srcdir)/clean.mk
 # My rules
 # --------
 
-sim_lib: $(top_builddir)libsim.a
+sim_lib: $(top_builddir)/libsim.a
 
-$(top_builddir)libsim.a: $(OBJECTS)
+$(top_builddir)/libsim.a: $(OBJECTS)
 	ar -rcu $*.a $(OBJECTS)
 	$(RANLIB) $*.a
 
@@ -117,7 +118,7 @@ $(top_builddir)libsim.a: $(OBJECTS)
 # Remaking configuration
 # ----------------------
 checkconf:
-	@if [ -f $(top_builddir)devel ]; then\
+	@if [ -f $(top_builddir)/devel ]; then\
 	  $(MAKE) -f conf.mk srcdir="$(srcdir)" top_builddir="$(top_builddir)" freshconf;\
 	fi