projects
/
fw
/
sdcc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* sim/ucsim/avr.src/Makefile.in, sim/ucsim/hc08.src/Makefile.in,
[fw/sdcc]
/
sim
/
ucsim
/
sim.src
/
Makefile.in
diff --git
a/sim/ucsim/sim.src/Makefile.in
b/sim/ucsim/sim.src/Makefile.in
index 8eeeb05a07677a895ac9a6a1b2c5c69846ca3b05..0a420a2fed5c277b6dcab760816fa2a4fe322f0a 100644
(file)
--- a/
sim/ucsim/sim.src/Makefile.in
+++ b/
sim/ucsim/sim.src/Makefile.in
@@
-13,11
+13,12
@@
CXXCPP = @CXXCPP@
RANLIB = @RANLIB@
INSTALL = @INSTALL@
RANLIB = @RANLIB@
INSTALL = @INSTALL@
-PRJDIR = ..
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
DEFS = $(subs -DHAVE_CONFIG_H,,@DEFS@)
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@
CFLAGS = @CFLAGS@ -Wall
CXXFLAGS = @CXXFLAGS@ -Wall
M_OR_MM = @M_OR_MM@
@@
-27,23
+28,25
@@
exec_prefix = @exec_prefix@
bindir = @bindir@
libdir = @libdir@
datadir = @datadir@
bindir = @bindir@
libdir = @libdir@
datadir = @datadir@
+datarootdir = @datarootdir@
includedir = @includedir@
mandir = @mandir@
man1dir = $(mandir)/man1
man2dir = $(mandir)/man2
infodir = @infodir@
srcdir = @srcdir@
includedir = @includedir@
mandir = @mandir@
man1dir = $(mandir)/man1
man2dir = $(mandir)/man2
infodir = @infodir@
srcdir = @srcdir@
+VPATH = @srcdir@
-OBJECTS =
app.o sim.o itsrc.o brk.o option.o arg.o stack
.o \
- guiobj.o uc.o hw.o
mem.o
+OBJECTS =
stack.o mem.o sim.o itsrc.o brk.o arg
.o \
+ guiobj.o uc.o hw.o
# Compiling entire program or any subproject
# ------------------------------------------
# Compiling entire program or any subproject
# ------------------------------------------
-all: checkconf sim_lib
test_mem_speed
+all: checkconf sim_lib
-test_mem_speed: test_mem_speed.o
- $(C
C) -o $@ $< -L$(PRJDIR) -lsim -lutil
+test_mem_speed:
$(top_builddir)/lib*.a
test_mem_speed.o
+ $(C
XX) -o $@ test_mem_speed.o -L$(top_builddir) -Wl,--start-group -lsim -lucsimutil -lcmd -Wl,--end-group
sim.src: all
sim.src: all
@@
-60,8
+63,10
@@
uninstall:
# Performing self-test
# --------------------
# Performing self-test
# --------------------
-check:
+check: test
+ ./test_mem_speed
+test: test_mem_speed
# Performing installation test
# ----------------------------
# Performing installation test
# ----------------------------
@@
-77,11
+82,11
@@
installdirs:
# ---------------------
dep: main.dep
# ---------------------
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
#parser.cc: parser.y
@@
-90,9
+95,9
@@
include clean.mk
# My rules
# --------
# 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
ar -rcu $*.a $(OBJECTS)
$(RANLIB) $*.a
@@
-113,8
+118,8
@@
$(PRJDIR)/libsim.a: $(OBJECTS)
# Remaking configuration
# ----------------------
checkconf:
# 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
fi
# End of sim.src/Makefile