projects
/
fw
/
sdcc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* device/lib/pic16/Makefile.common.in: added $(MM) to fix `make clean`
[fw/sdcc]
/
sim
/
ucsim
/
s51.src
/
Makefile.in
diff --git
a/sim/ucsim/s51.src/Makefile.in
b/sim/ucsim/s51.src/Makefile.in
index 08e82b54bc5f909745e7f91f669a6ab190932b6a..5f4ec97fac6f62dbb0f3acafdf3b3e77755dda1a 100644
(file)
--- a/
sim/ucsim/s51.src/Makefile.in
+++ b/
sim/ucsim/s51.src/Makefile.in
@@
-12,6
+12,7
@@
CPP = @CPP@
CXXCPP = @CXXCPP@
RANLIB = @RANLIB@
INSTALL = @INSTALL@
CXXCPP = @CXXCPP@
RANLIB = @RANLIB@
INSTALL = @INSTALL@
+STRIP = @STRIP@
PRJDIR = ..
PRJDIR = ..
@@
-28,9
+29,8
@@
SDCC = sdcc
SDCFLAGS = --debug --stack-after-data --model-small
SDCPPFLAGS =
SDCFLAGS = --debug --stack-after-data --model-small
SDCPPFLAGS =
-LIBS = @LIBS@ -L$(PRJDIR) -
lsim -lcmd -lguiucsim -lutil
+LIBS = @LIBS@ -L$(PRJDIR) -
Wl,--start-group -lutil -lsim -lcmd -lguiucsim -Wl,--end-group
DL = @DL@
DL = @DL@
-
dl_ok = @dl_ok@
prefix = @prefix@
dl_ok = @dl_ok@
prefix = @prefix@
@@
-45,41
+45,46
@@
man2dir = $(mandir)/man2
infodir = @infodir@
srcdir = @srcdir@
infodir = @infodir@
srcdir = @srcdir@
+EXEEXT = @EXEEXT@
+
OBJECTS_SHARED = glob.o sim51.o \
inc.o jmp.o mov.o logic.o arith.o bit.o \
timer0.o timer1.o timer2.o serial.o port.o interrupt.o \
OBJECTS_SHARED = glob.o sim51.o \
inc.o jmp.o mov.o logic.o arith.o bit.o \
timer0.o timer1.o timer2.o serial.o port.o interrupt.o \
- uc51.o uc52.o uc51r.o uc89c51r.o uc251.o
+ wdt.o pca.o \
+ uc51.o uc52.o uc51r.o uc89c51r.o uc251.o \
+ uc390.o uc390hw.o
OBJECTS_EXE = s51.o
OBJECTS = $(OBJECTS_SHARED) $(OBJECTS_EXE)
OBJECTS_EXE = s51.o
OBJECTS = $(OBJECTS_SHARED) $(OBJECTS_EXE)
+enable_dlso = @enable_dlso@
+dlso_ok = @dlso_ok@
+
# Compiling entire program or any subproject
# ------------------------------------------
all: checkconf otherlibs s51.src
# Compiling entire program or any subproject
# ------------------------------------------
all: checkconf otherlibs s51.src
-tests: test_ser.ihx
-
-test_ser.ihx: test_ser.rel
- $(SDCC) $(SDCFLAGS) $<
-
# Compiling and installing everything and runing test
# ---------------------------------------------------
install: all installdirs
# Compiling and installing everything and runing test
# ---------------------------------------------------
install: all installdirs
- if test -f s51.exe; then $(INSTALL) -s s51.exe $(bindir);fi
- if test -f s51; then $(INSTALL) -s s51 $(bindir);fi
+ $(INSTALL) -s s51$(EXEEXT) $(DESTDIR)$(bindir)
# Deleting all the installed files
# --------------------------------
uninstall:
# Deleting all the installed files
# --------------------------------
uninstall:
- rm -f $(
bindir)/s51
+ rm -f $(
DESTDIR)$(bindir)/s51$(EXEEXT)
# Performing self-test
# --------------------
# Performing self-test
# --------------------
-check:
+check: test
+
+test: test_ser.ihx
+test_ser.ihx: test_ser.rel
+ $(SDCC) $(SDCFLAGS) $<
# Performing installation test
# ----------------------------
# Performing installation test
# ----------------------------
@@
-89,7
+94,7
@@
installcheck:
# Creating installation directories
# ---------------------------------
installdirs:
# Creating installation directories
# ---------------------------------
installdirs:
- test -d $(
bindir) || $(INSTALL) -d
$(bindir)
+ test -d $(
DESTDIR)$(bindir) || $(INSTALL) -d $(DESTDIR)
$(bindir)
# Creating dependencies
# Creating dependencies
@@
-110,22
+115,24
@@
include clean.mk
# --------
.SUFFIXES: .rel
# --------
.SUFFIXES: .rel
-s51.src: s51 shared_lib
+s51.src: s51
$(EXEEXT)
shared_lib
-s51: $(OBJECTS) $(PRJDIR)/*.a
- $(CXX) $(CXXFLAGS)
-o s51 $(OBJECTS) $(LIBS)
+s51
$(EXEEXT)
: $(OBJECTS) $(PRJDIR)/*.a
+ $(CXX) $(CXXFLAGS)
$(OBJECTS) $(LIBS) -o $@
-ifeq ($(
SHAREDLIB
),yes)
+ifeq ($(
dlso_ok
),yes)
shared_lib: $(PRJDIR)/s51.so
else
shared_lib:
shared_lib: $(PRJDIR)/s51.so
else
shared_lib:
- @echo "No shared lib made."
+ @$(PRJDIR)/mkecho $(PRJDIR) "No 51 shared lib made."
+ @$(PRJDIR)/mkecho $(PRJDIR) "(SHAREDLIB="$(SHAREDLIB)",dl_ok="$(dl_ok)",enable_dlso="$(enable_dlso)")"
endif
$(PRJDIR)/s51.so: $(OBJECTS_SHARED)
endif
$(PRJDIR)/s51.so: $(OBJECTS_SHARED)
- $(CXX) -shared $(OBJECTS_SHARED) -o $
(PRJDIR)/s51.so
+ $(CXX) -shared $(OBJECTS_SHARED) -o $
@
otherlibs:
otherlibs:
+ cd $(PRJDIR) && $(MAKE) libs
cd $(PRJDIR)/cmd.src && $(MAKE) all
cd $(PRJDIR)/sim.src && $(MAKE) all
$(MAKE) -C $(PRJDIR)/gui.src checkconf ucsim_lib
cd $(PRJDIR)/cmd.src && $(MAKE) all
cd $(PRJDIR)/sim.src && $(MAKE) all
$(MAKE) -C $(PRJDIR)/gui.src checkconf ucsim_lib