Commit d9eeb3b7f69129f2bcb666f8a204c080a9e02433
1 parent
731b0d34
Exists in
master
and in
3 other branches
Ajustes para facilitar o debug da biblioteca em separado
Showing
3 changed files
with
14 additions
and
5 deletions
Show diff stats
Makefile.in
@@ -140,21 +140,27 @@ $(BINRLS)/lib3270@DLLEXT@.@VERSION@: $(foreach SRC, $(basename $(SOURCES)), $(OB | @@ -140,21 +140,27 @@ $(BINRLS)/lib3270@DLLEXT@.@VERSION@: $(foreach SRC, $(basename $(SOURCES)), $(OB | ||
140 | $(BINDBG)/testprogram$(EXEEXT): $(OBJDBG)/testprogram.o $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC)@OBJEXT@) | 140 | $(BINDBG)/testprogram$(EXEEXT): $(OBJDBG)/testprogram.o $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC)@OBJEXT@) |
141 | @echo " CCLD `basename $@`" | 141 | @echo " CCLD `basename $@`" |
142 | @$(MKDIR) `dirname $@` | 142 | @$(MKDIR) `dirname $@` |
143 | - $(LD) -pthread -o $@ $^ $(LIBS) | 143 | + @$(LD) -pthread -o $@ $^ $(LIBS) |
144 | 144 | ||
145 | $(BINDIR)/pot/lib3270.pot: $(foreach SRC, $(basename $(SOURCES)), $(TMPDIR)/pot/$(SRC).pot) | 145 | $(BINDIR)/pot/lib3270.pot: $(foreach SRC, $(basename $(SOURCES)), $(TMPDIR)/pot/$(SRC).pot) |
146 | @rm -f $@ | 146 | @rm -f $@ |
147 | @mkdir -p `dirname $@` | 147 | @mkdir -p `dirname $@` |
148 | @$(MSGCAT) --sort-output $^ > $@ | 148 | @$(MSGCAT) --sort-output $^ > $@ |
149 | 149 | ||
150 | +test: $(BINDBG)/testprogram$(EXEEXT) | ||
151 | + | ||
150 | run: $(BINDBG)/testprogram$(EXEEXT) | 152 | run: $(BINDBG)/testprogram$(EXEEXT) |
151 | - $(BINDBG)/testprogram$(EXEEXT) | 153 | +ifeq ($(VALGRIND),no) |
154 | + @PATH="$(BINDIR)/Debug@DLLDIR@:$(PATH)" "$(BINDBG)/testprogram$(EXEEXT)" | ||
155 | +else | ||
156 | + @PATH="$(BINDIR)/Debug@DLLDIR@:$(PATH)" G_DEBUG=gc-friendly G_SLICE=always-malloc \$(VALGRIND) --leak-check=full --suppressions=valgrind.suppression --gen-suppressions=all $(BINDBG)/testprogram$(EXEEXT) | ||
157 | +endif | ||
152 | 158 | ||
153 | memchk: $(BINDBG)/testprogram$(EXEEXT) | 159 | memchk: $(BINDBG)/testprogram$(EXEEXT) |
154 | ifeq ($(VALGRIND),no) | 160 | ifeq ($(VALGRIND),no) |
155 | @cd "$(ROOTDIR)" ; .bin/Debug/testprogram$(EXEEXT) | 161 | @cd "$(ROOTDIR)" ; .bin/Debug/testprogram$(EXEEXT) |
156 | else | 162 | else |
157 | - @cd "$(ROOTDIR)" ; G_DEBUG=gc-friendly G_SLICE=always-malloc \$(VALGRIND) --leak-check=full --gen-suppressions=all $(BINDBG)/testprogram$(EXEEXT) | 163 | + @cd "$(ROOTDIR)" ; \$(VALGRIND) --leak-check=full --gen-suppressions=all $(BINDBG)/testprogram$(EXEEXT) |
158 | endif | 164 | endif |
159 | 165 | ||
160 | version.c: ./mkversion.sh | 166 | version.c: ./mkversion.sh |
@@ -168,6 +174,8 @@ fallbacks.c: X3270.xad mkfb.c | @@ -168,6 +174,8 @@ fallbacks.c: X3270.xad mkfb.c | ||
168 | @$(HOST_CC) -g -o $(BINDIR)/mkfb@EXEEXT@ mkfb.c | 174 | @$(HOST_CC) -g -o $(BINDIR)/mkfb@EXEEXT@ mkfb.c |
169 | @$(BINDIR)/mkfb@EXEEXT@ -c X3270.xad $@ | 175 | @$(BINDIR)/mkfb@EXEEXT@ -c X3270.xad $@ |
170 | 176 | ||
177 | +cleantest: clean | ||
178 | + | ||
171 | clean: | 179 | clean: |
172 | @rm -fr .obj | 180 | @rm -fr .obj |
173 | @rm -fr .bin | 181 | @rm -fr .bin |
lib3270.cbp
@@ -3,6 +3,7 @@ | @@ -3,6 +3,7 @@ | ||
3 | <FileVersion major="1" minor="6" /> | 3 | <FileVersion major="1" minor="6" /> |
4 | <Project> | 4 | <Project> |
5 | <Option title="lib3270" /> | 5 | <Option title="lib3270" /> |
6 | + <Option makefile_is_custom="1" /> | ||
6 | <Option pch_mode="2" /> | 7 | <Option pch_mode="2" /> |
7 | <Option compiler="gcc" /> | 8 | <Option compiler="gcc" /> |
8 | <Build> | 9 | <Build> |
@@ -30,8 +31,8 @@ | @@ -30,8 +31,8 @@ | ||
30 | <Add option="-s" /> | 31 | <Add option="-s" /> |
31 | </Linker> | 32 | </Linker> |
32 | </Target> | 33 | </Target> |
33 | - <Target title="testprogram"> | ||
34 | - <Option output=".bin/Debug/lib3270" prefix_auto="1" extension_auto="1" /> | 34 | + <Target title="test"> |
35 | + <Option output=".bin/Debug/testprogram" prefix_auto="1" extension_auto="1" /> | ||
35 | <Option object_output=".obj/testprogram/" /> | 36 | <Option object_output=".obj/testprogram/" /> |
36 | <Option type="1" /> | 37 | <Option type="1" /> |
37 | <Option compiler="gcc" /> | 38 | <Option compiler="gcc" /> |