Download as
Browse Code »

Commit 8ea0b845bd7c63a0d0cc4afaaf16f22bb132838b

Authored by Perry Werneck
1 parent 921d9989
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Melhorando construção do módulo base para extensões.

Showing 2 changed files with 9 additions and 6 deletions   Show diff stats
pw3270.spec.in
  Diff comments   View file @8ea0b84
... ... @@ -28,7 +28,7 @@
28 28 %define _office 0
29 29 %define _php 0
30 30 %define _ooRexx 1
31   -%define _java 1
  31 +%define _java 0
32 32 %define _python 1
33 33  
34 34 %define _distro linux
... ... @@ -484,9 +484,11 @@ rm -rf %{buildroot}
484 484 %{_datadir}/@PACKAGE@/ui/98trace.xml
485 485 %{_datadir}/@PACKAGE@/ui/99debug.xml
486 486 %{_libdir}/lib@PACKAGE@.so
487   -%{_libdir}/@PACKAGE@class.a
488 487 %{_libdir}/pkgconfig/@PACKAGE@.pc
489 488  
  489 +%{_libdir}/@PACKAGE@cpp.a
  490 +%{_includedir}/@PACKAGE@cpp.h
  491 +
490 492 %dir %{_datadir}/@PACKAGE@/sample
491 493 %{_datadir}/@PACKAGE@/sample/*
492 494  
... ...
src/classlib/Makefile.in
  Diff comments   View file @8ea0b84
... ... @@ -25,7 +25,7 @@
25 25 #
26 26  
27 27 PACKAGE=@PACKAGE_NAME@
28   -LIBNAME=$(PACKAGE)class.a
  28 +LIBNAME=$(PACKAGE)cpp.a
29 29  
30 30 #---[ Sources ]----------------------------------------------------------------
31 31  
... ... @@ -92,8 +92,8 @@ $(BINRLS)/$(LIBNAME): $(foreach SRC, $(basename $(CLASS_SRC)), $(OBJRLS)/$(SRC).
92 92 @ar rs $@ $^
93 93  
94 94 install: Release
95   - @$(MKDIR) $(DESTDIR)$(datarootdir)/$(PACKAGE)
96   - @$(INSTALL_DATA) $(BINRLS)/$(LIBNAME) $(DESTDIR)$(datarootdir)/$(PACKAGE)
  95 + @$(MKDIR) $(DESTDIR)$(libdir)
  96 + @$(INSTALL_DATA) $(BINRLS)/$(LIBNAME) $(DESTDIR)$(libdir)
97 97  
98 98 #---[ Debug targets ]----------------------------------------------------------
99 99  
... ... @@ -117,7 +117,8 @@ install-sdk: $(BINRLS)/$(LIBNAME)
117 117 @$(MKDIR) $(DESTDIR)$(datarootdir)/$(PACKAGE)/sample/classlib
118 118 @$(INSTALL_DATA) *.cc $(DESTDIR)$(datarootdir)/$(PACKAGE)/sample/classlib
119 119 @$(MKDIR) $(DESTDIR)/$(includedir)/pw3270
120   - @$(INSTALL_DATA) ../include/pw3270/class.h $(DESTDIR)/$(includedir)/pw3270
  120 + @$(INSTALL_DATA) ../include/pw3270/class.h $(DESTDIR)/$(includedir)/pw3270
  121 + @$(LN_S) ./pw3270/class.h $(DESTDIR)/$(includedir)/$(PACKAGE)cpp.h
121 122 @$(MKDIR) $(DESTDIR)$(libdir)
122 123 @$(INSTALL_DATA) $(BINRLS)/$(LIBNAME) $(DESTDIR)$(libdir)
123 124  
... ...