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

[fw/sdcc] / sim / ucsim / hc08.src / Makefile.in

diff --git a/sim/ucsim/hc08.src/Makefile.in b/sim/ucsim/hc08.src/Makefile.in
index e45b4477ba9f7c88399913a6bceac27f884993e5..8dddea137c08ffe840a2ca7144d5c567250edb00 100644 (file)
--- a/sim/ucsim/hc08.src/Makefile.in
+++ b/sim/ucsim/hc08.src/Makefile.in
@@ -23,13 +23,14 @@ 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@
 PICOPT         = @PICOPT@
 SHAREDLIB      = @SHAREDLIB@
 
 EXEEXT          = @EXEEXT@
 
-LIBS           = @LIBS@ -L$(top_builddir) -lsim -lutil -lguiucsim -lcmd -lsim
+LIBS           = -L$(top_builddir) -lsim -lucsimutil -lguiucsim -lcmd -lsim @LIBS@
 DL             = @DL@
 dl_ok          = @dl_ok@
 
@@ -38,6 +39,7 @@ exec_prefix     = @exec_prefix@
 bindir          = @bindir@
 libdir          = @libdir@
 datadir         = @datadir@
+datarootdir     = @datarootdir@
 includedir      = @includedir@
 mandir          = @mandir@
 man1dir         = $(mandir)/man1
@@ -105,7 +107,7 @@ dep: Makefile.dep
 Makefile.dep: $(srcdir)/*.cc $(srcdir)/*.h
        $(CXXCPP) $(CPPFLAGS) $(M_OR_MM) $(filter %.cc,$^) >Makefile.dep
 
-include Makefile.dep
+-include Makefile.dep
 include $(srcdir)/clean.mk
 
 # My rules
@@ -114,23 +116,23 @@ include $(srcdir)/clean.mk
 
 hc08.src: shc08$(EXEEXT)  shared_lib
 
-shc08$(EXEEXT): $(OBJECTS) $(top_builddir)*.a
-       $(CXX) $(CXXFLAGS) -o $@ $(OBJECTS) $(LIBS)
+shc08$(EXEEXT): $(OBJECTS) $(top_builddir)/*.a
+       $(CXX) $(CXXFLAGS) $(LDFLAGS)  -o $@ $(OBJECTS) $(LIBS)
 
 ifeq ($(dlso_ok),yes)
-shared_lib: $(top_builddir)shc08.so
+shared_lib: $(top_builddir)/shc08.so
 else
 shared_lib:
        @$(top_srcdir)/mkecho $(top_builddir) "No hc08 shared lib made."
        @$(top_srcdir)/mkecho $(top_builddir) "(SHAREDLIB="$(SHAREDLIB)",dl_ok="$(dl_ok)",enable_dlso="$(enable_dlso)")"
 endif
 
-$(top_builddir)shc08.so: $(OBJECTS_SHARED)
-       $(CXX) -shared $(OBJECTS_SHARED) -o $(top_builddir)shc08.so
+$(top_builddir)/shc08.so: $(OBJECTS_SHARED)
+       $(CXX) -shared $(LDFLAGS) $(OBJECTS_SHARED) -o $(top_builddir)/shc08.so
 
 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 $@
@@ -142,7 +144,7 @@ otherlibs:
 # 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