From 8997b78dd05abfea6226a33181c2d1fc6be6782b Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Mon, 26 Nov 2018 11:23:36 -0200 Subject: [PATCH] Working on C++ API. --- src/lib3270++/Makefile.in | 19 +++++++++++++++---- src/lib3270++/lib3270++.cbp | 1 + src/lib3270++/local/events.cc | 4 +--- src/lib3270++/private.h | 2 +- src/lib3270++/valgrind.suppression | 0 5 files changed, 18 insertions(+), 8 deletions(-) create mode 100644 src/lib3270++/valgrind.suppression diff --git a/src/lib3270++/Makefile.in b/src/lib3270++/Makefile.in index 78fea20..1237cf1 100644 --- a/src/lib3270++/Makefile.in +++ b/src/lib3270++/Makefile.in @@ -29,7 +29,8 @@ LIBNAME=lib@LIB3270_NAME@++ SOURCES= \ - $(wildcard *.cc) + $(wildcard *.cc) \ + $(wildcard local/*.cc) \ TEST_SOURCES= \ $(wildcard testprogram/*.cc) @@ -198,6 +199,7 @@ $(BINRLS)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \ -o $@ \ $(LDFLAGS) \ $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC).o) \ + -L$(BINRLS) \ $(LIBS) $(BINRLS)/$(LIBNAME).a: \ @@ -288,7 +290,12 @@ $(BINDBG)/$(LIBNAME)@EXEEXT@: \ @$(MKDIR) `dirname $@` @echo $< ... - $(LD) -o $@ $^ $(LDFLAGS) $(LIBS) + @$(LD) \ + -Wl,--rpath,$(BINDBG) \ + -o $@ \ + $^ \ + $(LDFLAGS) \ + $(LIBS) run: \ $(BINDBG)/$(LIBNAME)@EXEEXT@ @@ -330,11 +337,15 @@ $(BINDBG)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \ @$(MKDIR) `dirname $@` @echo $< ... @$(LD) \ - -shared -Wl,-soname,$(@F) \ + -shared \ + -Wl,-soname,$(@F) \ + -Wl,--rpath,$(BINDBG) \ -o $@ \ $(LDFLAGS) \ $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC).o) \ - $(LIBS) + -L$(BINDBG) \ + $(LIBS) \ + -l3270 #---[ Clean Targets ]-------------------------------------------------------------------- diff --git a/src/lib3270++/lib3270++.cbp b/src/lib3270++/lib3270++.cbp index bf67e08..2b6f978 100644 --- a/src/lib3270++/lib3270++.cbp +++ b/src/lib3270++/lib3270++.cbp @@ -3,6 +3,7 @@