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

diff --git a/sim/ucsim/xa.src/Makefile.in b/sim/ucsim/xa.src/Makefile.in
index bd69b494..90529f26 100644
--- a/sim/ucsim/xa.src/Makefile.in
+++ b/sim/ucsim/xa.src/Makefile.in
@@ -25,15 +25,17 @@ CPPFLAGS        = @CPPFLAGS@ -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) \
 		  -I$(top_srcdir)/gui.src
 CFLAGS          = @CFLAGS@ -Wall
 CXXFLAGS        = @CXXFLAGS@ -Wall
+LDFLAGS         = @LDFLAGS@
 M_OR_MM         = @M_OR_MM@
 
-LIBS		= @LIBS@ -L$(top_builddir) -lsim -lutil -lguiucsim -lcmd -lsim
+LIBS		= @LIBS@ -L$(top_builddir) -lsim -lucsimutil -lguiucsim -lcmd -lsim
 
 prefix          = @prefix@
 exec_prefix     = @exec_prefix@
 bindir          = @bindir@
 libdir          = @libdir@
 datadir         = @datadir@
+datarootdir     = @datarootdir@
 includedir      = @includedir@
 mandir          = @mandir@
 man1dir         = $(mandir)/man1
@@ -92,9 +94,9 @@ installdirs:
 dep: Makefile.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
 
 # My rules
@@ -103,12 +105,12 @@ include $(srcdir)/clean.mk
 
 xa.src: sxa$(EXEEXT)
 
-sxa$(EXEEXT): $(OBJECTS) $(top_builddir)*.a
-	$(CXX) $(CXXFLAGS) -o $@ $(OBJECTS) $(LIBS)
+sxa$(EXEEXT): $(OBJECTS) $(top_builddir)/*.a
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LIBS)
 
 otherlibs:
-	$(MAKE) -C $(top_builddir)cmd.src all
-	$(MAKE) -C $(top_builddir)sim.src all
+	$(MAKE) -C $(top_builddir)/cmd.src all
+	$(MAKE) -C $(top_builddir)/sim.src all
 
 .cc.o:
 	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c $< -o $@
@@ -120,7 +122,7 @@ otherlibs:
 # Remaking configuration
 # ----------------------
 checkconf:
-	@if [ -f $(top_builddir)devel ]; then\
+	@if [ -f $(top_builddir)/devel ]; then\
 	  $(MAKE) -f $(srcdir)/conf.mk srcdir="$(srcdir)" top_builddir="$(top_builddir)" freshconf;\
 	fi