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

diff --git a/sim/ucsim/sim.src/Makefile.in b/sim/ucsim/sim.src/Makefile.in
index 9bfd6468..0a420a2f 100644
--- a/sim/ucsim/sim.src/Makefile.in
+++ b/sim/ucsim/sim.src/Makefile.in
@@ -13,11 +13,12 @@ CXXCPP		= @CXXCPP@
 RANLIB		= @RANLIB@
 INSTALL		= @INSTALL@
 
-PRJDIR		= ..
+top_builddir	= @top_builddir@
+top_srcdir	= @top_srcdir@
 
 DEFS            = $(subs -DHAVE_CONFIG_H,,@DEFS@)
-CPPFLAGS        = @CPPFLAGS@ -I. -I$(PRJDIR) \
-		  -I$(PRJDIR)/cmd.src -I$(PRJDIR)/gui.src
+CPPFLAGS        = @CPPFLAGS@ -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) \
+		  -I$(top_srcdir)/cmd.src -I$(top_srcdir)/gui.src
 CFLAGS          = @CFLAGS@ -Wall
 CXXFLAGS        = @CXXFLAGS@ -Wall
 M_OR_MM         = @M_OR_MM@
@@ -27,14 +28,16 @@ exec_prefix     = @exec_prefix@
 bindir          = @bindir@
 libdir          = @libdir@
 datadir         = @datadir@
+datarootdir     = @datarootdir@
 includedir      = @includedir@
 mandir          = @mandir@
 man1dir         = $(mandir)/man1
 man2dir         = $(mandir)/man2
 infodir         = @infodir@
 srcdir          = @srcdir@
+VPATH           = @srcdir@
 
-OBJECTS         = mem.o app.o sim.o itsrc.o brk.o option.o arg.o stack.o \
+OBJECTS         = stack.o mem.o sim.o itsrc.o brk.o arg.o \
 		  guiobj.o uc.o hw.o
 
 
@@ -42,8 +45,8 @@ OBJECTS         = mem.o app.o sim.o itsrc.o brk.o option.o arg.o stack.o \
 # ------------------------------------------
 all: checkconf sim_lib
 
-test_mem_speed: $(PRJDIR)/lib*.a test_mem_speed.o
-	$(CC) -o $@ test_mem_speed.o -L$(PRJDIR) -lsim -lutil -lcmd -lsim
+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
 
@@ -79,11 +82,11 @@ installdirs:
 # ---------------------
 dep: main.dep
 
-Makefile.dep: *.cc *.h
-	$(CXXCPP) $(CPPFLAGS) $(M_OR_MM) *.cc >Makefile.dep
+Makefile.dep: $(srcdir)/*.cc $(srcdir)/*.h
+	$(CXXCPP) $(CPPFLAGS) $(M_OR_MM) $(filter %.cc,$^) >Makefile.dep
 
-include Makefile.dep
-include clean.mk
+-include Makefile.dep
+include $(srcdir)/clean.mk
 
 #parser.cc: parser.y
 
@@ -92,9 +95,9 @@ include clean.mk
 # My rules
 # --------
 
-sim_lib: $(PRJDIR)/libsim.a
+sim_lib: $(top_builddir)/libsim.a
 
-$(PRJDIR)/libsim.a: $(OBJECTS)
+$(top_builddir)/libsim.a: $(OBJECTS)
 	ar -rcu $*.a $(OBJECTS)
 	$(RANLIB) $*.a
 
@@ -115,8 +118,8 @@ $(PRJDIR)/libsim.a: $(OBJECTS)
 # Remaking configuration
 # ----------------------
 checkconf:
-	@if [ -f $(PRJDIR)/devel ]; then\
-	  $(MAKE) -f conf.mk srcdir="$(srcdir)" PRJDIR="$(PRJDIR)" freshconf;\
+	@if [ -f $(top_builddir)/devel ]; then\
+	  $(MAKE) -f conf.mk srcdir="$(srcdir)" top_builddir="$(top_builddir)" freshconf;\
 	fi
 
 # End of sim.src/Makefile