Download as
Browse Code »

Commit 88b949a8cdbfdb146ccd0962e4a665ac144aae95

Authored by perry.werneck@gmail.com
1 parent 17264499
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Incluindo classe para linkagem estática no pacote devel

Showing 3 changed files with 12 additions and 5 deletions   Show diff stats
@@ -5,7 +5,7 @@ msgid "" @@ -5,7 +5,7 @@ msgid ""
5 msgstr "" 5 msgstr ""
6 "Project-Id-Version: pw3270 5.0\n" 6 "Project-Id-Version: pw3270 5.0\n"
7 "Report-Msgid-Bugs-To: \n" 7 "Report-Msgid-Bugs-To: \n"
8 -"POT-Creation-Date: 2013-07-17 09:44-0300\n" 8 +"POT-Creation-Date: 2013-07-17 11:07-0300\n"
9 "PO-Revision-Date: 2013-07-03 10:51-0300\n" 9 "PO-Revision-Date: 2013-07-03 10:51-0300\n"
10 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n" 10 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
11 "Language-Team: Português <perry.werneck@gmail.com>\n" 11 "Language-Team: Português <perry.werneck@gmail.com>\n"
pw3270.spec.in
  Diff comments   View file @88b949a
@@ -222,6 +222,7 @@ rm -rf $RPM_BUILD_ROOT @@ -222,6 +222,7 @@ rm -rf $RPM_BUILD_ROOT
222 %{_libdir}/pkgconfig/*.pc 222 %{_libdir}/pkgconfig/*.pc
223 %{_libdir}/lib3270.so 223 %{_libdir}/lib3270.so
224 %{_libdir}/libpw3270.so 224 %{_libdir}/libpw3270.so
  225 +%{_libdir}/*.a
225 %dir %{_datadir}/@PACKAGE_NAME@/sample 226 %dir %{_datadir}/@PACKAGE_NAME@/sample
226 %{_datadir}/@PACKAGE_NAME@/sample/* 227 %{_datadir}/@PACKAGE_NAME@/sample/*
227 228
src/classlib/Makefile.in
  Diff comments   View file @88b949a
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
25 # 25 #
26 26
27 PACKAGE=@PACKAGE_NAME@ 27 PACKAGE=@PACKAGE_NAME@
28 -LIBNAME=$(PACKAGE)cxx.a 28 +LIBNAME=$(PACKAGE)class.a
29 29
30 #---[ Sources ]---------------------------------------------------------------- 30 #---[ Sources ]----------------------------------------------------------------
31 31
@@ -35,6 +35,8 @@ include class.mak @@ -35,6 +35,8 @@ include class.mak
35 35
36 prefix=@prefix@ 36 prefix=@prefix@
37 datarootdir=@datarootdir@ 37 datarootdir=@datarootdir@
  38 +includedir=@includedir@
  39 +libdir=@libdir@
38 40
39 ROOTDIR ?= . 41 ROOTDIR ?= .
40 OBJDIR ?= $(ROOTDIR)/.obj 42 OBJDIR ?= $(ROOTDIR)/.obj
@@ -109,9 +111,13 @@ $(BINDBG)/$(LIBNAME): $(foreach SRC, $(basename $(CLASS_SRC)), $(OBJDBG)/$(SRC). @@ -109,9 +111,13 @@ $(BINDBG)/$(LIBNAME): $(foreach SRC, $(basename $(CLASS_SRC)), $(OBJDBG)/$(SRC).
109 @ar rs $@ $^ 111 @ar rs $@ $^
110 112
111 #---[ Misc targets ]----------------------------------------------------------- 113 #---[ Misc targets ]-----------------------------------------------------------
112 -install-sdk:  
113 - $(MKDIR) $(DESTDIR)$(datarootdir)/$(PACKAGE)/sample/classlib  
114 - $(INSTALL_DATA) *.cc $(DESTDIR)$(datarootdir)/$(PACKAGE)/sample/classlib 114 +install-sdk: $(BINRLS)/$(LIBNAME)
  115 + @$(MKDIR) $(DESTDIR)$(datarootdir)/$(PACKAGE)/sample/classlib
  116 + @$(INSTALL_DATA) *.cc $(DESTDIR)$(datarootdir)/$(PACKAGE)/sample/classlib
  117 + @$(MKDIR) $(DESTDIR)/$(includedir)/pw3270
  118 + @$(INSTALL_DATA) ../include/pw3270/class.h $(DESTDIR)/$(includedir)/pw3270
  119 + @$(MKDIR) $(DESTDIR)$(libdir)
  120 + @$(INSTALL_DATA) $(BINRLS)/$(LIBNAME) $(DESTDIR)$(libdir)
115 121
116 clean: 122 clean:
117 @rm -fr $(OBJDIR) 123 @rm -fr $(OBJDIR)