Commit cd4baa46541cc5b218d733ce40a89f38f497f7a8

Authored by Perry Werneck
1 parent cf8919ae

Updating install options & README.md.

@@ -29,7 +29,7 @@ Cross-compiling on SuSE Linux (Native or WSL) @@ -29,7 +29,7 @@ Cross-compiling on SuSE Linux (Native or WSL)
29 * 32 bits: https://build.opensuse.org/project/show/windows:mingw:win32 29 * 32 bits: https://build.opensuse.org/project/show/windows:mingw:win32
30 * 64 bits: https://build.opensuse.org/project/show/windows:mingw:win64 30 * 64 bits: https://build.opensuse.org/project/show/windows:mingw:win64
31 31
32 -2. Get pw3270 sources from git 32 +2. Get lib3270 sources from git
33 33
34 * git clone http://softwarepublico.gov.br/gitlab/pw3270/lib3270.git ./lib3270 34 * git clone http://softwarepublico.gov.br/gitlab/pw3270/lib3270.git ./lib3270
35 35
src/lib3270++/Makefile.in
@@ -221,8 +221,12 @@ $(BINRLS)/static/$(LIBNAME).a: \ @@ -221,8 +221,12 @@ $(BINRLS)/static/$(LIBNAME).a: \
221 #---[ Install Targets ]------------------------------------------------------------------ 221 #---[ Install Targets ]------------------------------------------------------------------
222 222
223 install: \ 223 install: \
224 - $(BINRLS)/$(LIBNAME)@DLLEXT@ \  
225 - $(BINRLS)/static/$(LIBNAME).a 224 + install-shared \
  225 + install-static \
  226 + install-dev
  227 +
  228 +install-shared: \
  229 + $(BINRLS)/$(LIBNAME)@DLLEXT@
226 230
227 # Install library 231 # Install library
228 @mkdir -p $(DESTDIR)$(libdir) 232 @mkdir -p $(DESTDIR)$(libdir)
@@ -240,11 +244,16 @@ install: \ @@ -240,11 +244,16 @@ install: \
240 $(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@ \ 244 $(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@ \
241 $(DESTDIR)$(libdir)/$(LIBNAME)@DLLEXT@ 245 $(DESTDIR)$(libdir)/$(LIBNAME)@DLLEXT@
242 246
  247 +install-static: \
  248 + $(BINRLS)/static/$(LIBNAME).a
  249 +
243 # Install static library 250 # Install static library
244 @$(INSTALL_DATA) \ 251 @$(INSTALL_DATA) \
245 $(BINRLS)/static/$(LIBNAME).a \ 252 $(BINRLS)/static/$(LIBNAME).a \
246 $(DESTDIR)$(libdir) 253 $(DESTDIR)$(libdir)
247 254
  255 +install-dev:
  256 +
248 # Install SDK 257 # Install SDK
249 @$(INSTALL_DATA) \ 258 @$(INSTALL_DATA) \
250 ../include/$(LIBNAME).h \ 259 ../include/$(LIBNAME).h \
src/lib3270/Makefile.in
@@ -216,10 +216,11 @@ $(BINRLS)/static/$(LIBNAME).a: \ @@ -216,10 +216,11 @@ $(BINRLS)/static/$(LIBNAME).a: \
216 #---[ Install Targets ]------------------------------------------------------------------ 216 #---[ Install Targets ]------------------------------------------------------------------
217 217
218 install: \ 218 install: \
219 - install-library \ 219 + install-shared \
  220 + install-static \
220 install-dev 221 install-dev
221 222
222 -install-library: \ 223 +install-shared: \
223 $(BINRLS)/$(LIBNAME)@DLLEXT@ \ 224 $(BINRLS)/$(LIBNAME)@DLLEXT@ \
224 225
225 # Install library 226 # Install library
@@ -238,8 +239,7 @@ install-library: \ @@ -238,8 +239,7 @@ install-library: \
238 $(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@ \ 239 $(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@ \
239 $(DESTDIR)$(libdir)/$(LIBNAME)@DLLEXT@ 240 $(DESTDIR)$(libdir)/$(LIBNAME)@DLLEXT@
240 241
241 -  
242 -install-dev: \ 242 +install-static: \
243 $(BINRLS)/static/$(LIBNAME).a 243 $(BINRLS)/static/$(LIBNAME).a
244 244
245 # Install static library 245 # Install static library
@@ -247,8 +247,10 @@ install-dev: \ @@ -247,8 +247,10 @@ install-dev: \
247 $(BINRLS)/static/$(LIBNAME).a \ 247 $(BINRLS)/static/$(LIBNAME).a \
248 $(DESTDIR)$(libdir) 248 $(DESTDIR)$(libdir)
249 249
250 - # Install SDK  
251 250
  251 +install-dev:
  252 +
  253 + # Install SDK
252 @mkdir -p $(DESTDIR)$(includedir)/$(LIBNAME) 254 @mkdir -p $(DESTDIR)$(includedir)/$(LIBNAME)
253 255
254 @$(INSTALL_DATA) \ 256 @$(INSTALL_DATA) \