Download as
Browse Code »

Commit 0f7ff3392b7cb047c95fd0c00e1cd013db3a02f1

Authored by Perry Werneck
1 parent d0a76f59
Exists in master and in 1 other branch develop

Checking module for side effects of the updates in the main library 

Updating package
Showing 3 changed files with 21 additions and 19 deletions   Show diff stats
@@ -175,20 +175,24 @@ install: \ @@ -175,20 +175,24 @@ install: \
175 $(foreach PKG, $(INSTALL_PACKAGES), install-$(PKG)) 175 $(foreach PKG, $(INSTALL_PACKAGES), install-$(PKG))
176 176
177 177
178 -install-shared: \ 178 +install-linux-lib: \
179 $(BINRLS)/$(SONAME) 179 $(BINRLS)/$(SONAME)
180 180
181 - # Install library  
182 - @$(MKDIR) $(DESTDIR)$(libdir) 181 + @$(MKDIR) \
  182 + $(DESTDIR)$(libdir)
183 183
184 @$(INSTALL_PROGRAM) \ 184 @$(INSTALL_PROGRAM) \
185 $(BINRLS)/$(SONAME) \ 185 $(BINRLS)/$(SONAME) \
186 $(DESTDIR)$(libdir)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ 186 $(DESTDIR)$(libdir)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@
187 - 187 +
188 @$(LN_S) \ 188 @$(LN_S) \
189 $(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ \ 189 $(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ \
190 $(DESTDIR)$(libdir)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@ 190 $(DESTDIR)$(libdir)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@
191 191
  192 + @$(LN_S) \
  193 + $(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@ \
  194 + $(DESTDIR)$(libdir)/$(LIBNAME)@DLLEXT@
  195 +
192 install-dev: 196 install-dev:
193 197
194 # Install devel 198 # Install devel
@@ -197,26 +201,23 @@ install-dev: @@ -197,26 +201,23 @@ install-dev:
197 src/include/lib3270/*.h \ 201 src/include/lib3270/*.h \
198 $(DESTDIR)$(includedir)/lib3270 202 $(DESTDIR)$(includedir)/lib3270
199 203
200 - @$(MKDIR) $(DESTDIR)$(libdir)  
201 - @$(LN_S) \  
202 - $(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@ \  
203 - $(DESTDIR)$(libdir)/$(LIBNAME)@DLLEXT@  
204 -  
205 -  
206 -install-winlib: \ 204 +install-windows-lib: \
207 $(BINRLS)/$(SONAME) 205 $(BINRLS)/$(SONAME)
208 206
209 @$(MKDIR) \ 207 @$(MKDIR) \
210 - $(DESTDIR)$(libdir) 208 + $(DESTDIR)$(bindir)
211 209
212 - @$(INSTALL_DATA) \  
213 - $(BINRLS)/$(LIBNAME).dll.a \ 210 + @$(INSTALL_PROGRAM) \
  211 + $(BINRLS)/$(SONAME) \
  212 + $(DESTDIR)$(bindir)/$(LIBNAME)@DLLEXT@
  213 +
  214 + @$(MKDIR) \
214 $(DESTDIR)$(libdir) 215 $(DESTDIR)$(libdir)
215 216
216 @$(DLLTOOL) \ 217 @$(DLLTOOL) \
217 --input-def $(BINRLS)/$(LIBNAME).def \ 218 --input-def $(BINRLS)/$(LIBNAME).def \
218 --dllname $(LIBNAME).dll \ 219 --dllname $(LIBNAME).dll \
219 - --output-lib $(DESTDIR)$(libdir)/$(LIBNAME).lib 220 + --output-lib $(DESTDIR)$(libdir)/$(LIBNAME).dll.a
220 221
221 @$(MKDIR) \ 222 @$(MKDIR) \
222 $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/def 223 $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/def
@@ -245,7 +246,6 @@ $(BINDBG)/$(LIBNAME)@EXEEXT@: \ @@ -245,7 +246,6 @@ $(BINDBG)/$(LIBNAME)@EXEEXT@: \
245 $^ \ 246 $^ \
246 -L$(BINDBG) \ 247 -L$(BINDBG) \
247 -Wl,-rpath,$(BINDBG) \ 248 -Wl,-rpath,$(BINDBG) \
248 - $(LDFLAGS) \  
249 $(LIBS) 249 $(LIBS)
250 250
251 run: \ 251 run: \
@@ -92,7 +92,7 @@ AC_SUBST(APPDATADIR,$app_cv_source_appdatadir) @@ -92,7 +92,7 @@ AC_SUBST(APPDATADIR,$app_cv_source_appdatadir)
92 dnl --------------------------------------------------------------------------- 92 dnl ---------------------------------------------------------------------------
93 dnl Check for OS specifics 93 dnl Check for OS specifics
94 dnl --------------------------------------------------------------------------- 94 dnl ---------------------------------------------------------------------------
95 -INSTALL_PACKAGES="shared dev" 95 +INSTALL_PACKAGES="dev"
96 96
97 case "$host" in 97 case "$host" in
98 *-mingw32|*-pc-msys) 98 *-mingw32|*-pc-msys)
@@ -100,7 +100,7 @@ case "$host" in @@ -100,7 +100,7 @@ case "$host" in
100 100
101 CFLAGS="$CFLAGS -D_WIN32_WINNT=0x0600" 101 CFLAGS="$CFLAGS -D_WIN32_WINNT=0x0600"
102 LDFLAGS="$LDFLAGS -shared -Wl,--output-def,\$(@D)/\$(LIBNAME).def,--out-implib,\$(@D)/\$(LIBNAME).dll.a" 102 LDFLAGS="$LDFLAGS -shared -Wl,--output-def,\$(@D)/\$(LIBNAME).def,--out-implib,\$(@D)/\$(LIBNAME).dll.a"
103 - INSTALL_PACKAGES="$INSTALL_PACKAGES winlib" 103 + INSTALL_PACKAGES="windows-lib $INSTALL_PACKAGES"
104 104
105 LIBS="$LIBS -lws2_32 -lwtsapi32 -lcomdlg32" 105 LIBS="$LIBS -lws2_32 -lwtsapi32 -lcomdlg32"
106 DLLEXT=".dll" 106 DLLEXT=".dll"
@@ -131,6 +131,8 @@ case "$host" in @@ -131,6 +131,8 @@ case "$host" in
131 *) 131 *)
132 CFLAGS="$CFLAGS" 132 CFLAGS="$CFLAGS"
133 LDFLAGS="$LDFLAGS -shared" 133 LDFLAGS="$LDFLAGS -shared"
  134 + INSTALL_PACKAGES="linux-lib $INSTALL_PACKAGES"
  135 +
134 app_cv_datadir="/usr/share" 136 app_cv_datadir="/usr/share"
135 app_cv_confdir="/etc" 137 app_cv_confdir="/etc"
136 app_cv_osname="linux" 138 app_cv_osname="linux"
src/testprogram/testprogram.cc
  Diff comments   View file @0f7ff33
@@ -44,7 +44,7 @@ @@ -44,7 +44,7 @@
44 char buffer[SCREEN_LENGTH+1]; 44 char buffer[SCREEN_LENGTH+1];
45 45
46 const char *host = ""; 46 const char *host = "";
47 - const char *session = ""; // "pw3270:a"; 47 + const char *session = ":a";
48 48
49 #pragma GCC diagnostic push 49 #pragma GCC diagnostic push
50 static struct option options[] = 50 static struct option options[] =