Download as
Browse Code »

Commit 4288039a11999c294260e185a87f136a931ac1ac

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

Acertando empacotamento pelo suse build service

Showing 4 changed files with 187 additions and 158 deletions   Show diff stats
@@ -75,6 +75,7 @@ AC_SUBST(PACKAGE_REVISION, "SVN_REV") @@ -75,6 +75,7 @@ AC_SUBST(PACKAGE_REVISION, "SVN_REV")
75 75
76 #--[ Set host based options ]--------------------------------------------------------------------------------------------------------------------------------- 76 #--[ Set host based options ]---------------------------------------------------------------------------------------------------------------------------------
77 77
  78 +DLL_CFLAGS=""
78 DLL_FLAGS="-shared -Wl,-soname,\$(@F)" 79 DLL_FLAGS="-shared -Wl,-soname,\$(@F)"
79 SOCKET_LIBS="" 80 SOCKET_LIBS=""
80 81
@@ -83,7 +84,6 @@ OBJEXT=".o" @@ -83,7 +84,6 @@ OBJEXT=".o"
83 EXEEXT="" 84 EXEEXT=""
84 DLLPREFIX="lib" 85 DLLPREFIX="lib"
85 86
86 -  
87 if test $host != $build; then 87 if test $host != $build; then
88 AC_CHECK_PROGS(HOST_CC, gcc cc) 88 AC_CHECK_PROGS(HOST_CC, gcc cc)
89 else 89 else
@@ -103,14 +103,6 @@ case "$host" in @@ -103,14 +103,6 @@ case "$host" in
103 103
104 esac 104 esac
105 105
106 -  
107 -AC_SUBST(HOST_CC)  
108 -AC_SUBST(EXEEXT)  
109 -AC_SUBST(DLLPREFIX)  
110 -AC_SUBST(DLLEXT)  
111 -AC_SUBST(DLL_FLAGS)  
112 -AC_SUBST(SOCKET_LIBS)  
113 -  
114 #--[ Debug/Release ]------------------------------------------------------------------------------------------------------------------------------------------ 106 #--[ Debug/Release ]------------------------------------------------------------------------------------------------------------------------------------------
115 107
116 DBG_LDFLAGS="-L.bin/Debug/lib" 108 DBG_LDFLAGS="-L.bin/Debug/lib"
@@ -173,6 +165,35 @@ if test $app_cv_fvisibility_ok = yes; then @@ -173,6 +165,35 @@ if test $app_cv_fvisibility_ok = yes; then
173 CFLAGS="$CFLAGS -fvisibility=hidden" 165 CFLAGS="$CFLAGS -fvisibility=hidden"
174 fi 166 fi
175 167
  168 +#--[ Options ]------------------------------------------------------------------------------------------------------------------------------------------------
  169 +
  170 +AC_ARG_ENABLE([pic],
  171 + [AS_HELP_STRING([--enable-pic], [enable support for PIC libraries (required to compile PW3270 on some systems)])],
  172 +[
  173 + app_cv_pic="$enableval"
  174 +],[
  175 +
  176 + if test "$host_cpu" = "x86_64"; then
  177 + app_cv_pic="yes"
  178 + else
  179 + app_cv_pic="no"
  180 + fi
  181 +])
  182 +
  183 +if test "$app_cv_pic" == "yes"; then
  184 + DLL_CFLAGS="$DLL_CFLAGS -fPIC"
  185 +fi
  186 +
  187 +#--[ Headers ]------------------------------------------------------------------------------------------------------------------------------------------------
  188 +
  189 +AC_SUBST(HOST_CC)
  190 +AC_SUBST(EXEEXT)
  191 +AC_SUBST(DLLPREFIX)
  192 +AC_SUBST(DLLEXT)
  193 +AC_SUBST(DLL_FLAGS)
  194 +AC_SUBST(DLL_CFLAGS)
  195 +AC_SUBST(SOCKET_LIBS)
  196 +
176 #--[ Headers ]------------------------------------------------------------------------------------------------------------------------------------------------ 197 #--[ Headers ]------------------------------------------------------------------------------------------------------------------------------------------------
177 198
178 AC_CHECK_HEADER(malloc.h, AC_DEFINE(HAVE_MALLOC_H,,[do we have malloc.h?])) 199 AC_CHECK_HEADER(malloc.h, AC_DEFINE(HAVE_MALLOC_H,,[do we have malloc.h?]))
@@ -8,8 +8,8 @@ @@ -8,8 +8,8 @@
8 <Option compiler="gcc" /> 8 <Option compiler="gcc" />
9 <Build> 9 <Build>
10 <Target title="Debug"> 10 <Target title="Debug">
11 - <Option output=".bin/Debug/pw3270" prefix_auto="1" extension_auto="1" />  
12 - <Option object_output=".obj/Debug/" /> 11 + <Option output=".bin\Debug\pw3270" prefix_auto="1" extension_auto="1" />
  12 + <Option object_output=".obj\Debug\" />
13 <Option type="0" /> 13 <Option type="0" />
14 <Option compiler="gcc" /> 14 <Option compiler="gcc" />
15 <Compiler> 15 <Compiler>
@@ -18,8 +18,8 @@ @@ -18,8 +18,8 @@
18 </Compiler> 18 </Compiler>
19 </Target> 19 </Target>
20 <Target title="Release"> 20 <Target title="Release">
21 - <Option output=".bin/Release/pw3270" prefix_auto="1" extension_auto="1" />  
22 - <Option object_output=".obj/Release/" /> 21 + <Option output=".bin\Release\pw3270" prefix_auto="1" extension_auto="1" />
  22 + <Option object_output=".obj\Release\" />
23 <Option type="0" /> 23 <Option type="0" />
24 <Option compiler="gcc" /> 24 <Option compiler="gcc" />
25 <Compiler> 25 <Compiler>
@@ -33,280 +33,281 @@ @@ -33,280 +33,281 @@
33 <Compiler> 33 <Compiler>
34 <Add option="-Wall" /> 34 <Add option="-Wall" />
35 <Add option="`pkg-config gtk+-3.0 lib3270 --cflags`" /> 35 <Add option="`pkg-config gtk+-3.0 lib3270 --cflags`" />
36 - <Add directory="src/include" /> 36 + <Add directory="src\include" />
37 </Compiler> 37 </Compiler>
38 <Linker> 38 <Linker>
39 <Add option="`pkg-config gtk+-3.0 lib3270 --libs`" /> 39 <Add option="`pkg-config gtk+-3.0 lib3270 --libs`" />
40 </Linker> 40 </Linker>
41 <Unit filename="Makefile.in" /> 41 <Unit filename="Makefile.in" />
42 <Unit filename="configure.ac" /> 42 <Unit filename="configure.ac" />
43 - <Unit filename="src/gtk/Makefile.in" />  
44 - <Unit filename="src/gtk/actions.c"> 43 + <Unit filename="pw3270.spec.in" />
  44 + <Unit filename="src\gtk\Makefile.in" />
  45 + <Unit filename="src\gtk\actions.c">
45 <Option compilerVar="CC" /> 46 <Option compilerVar="CC" />
46 </Unit> 47 </Unit>
47 - <Unit filename="src/gtk/common/common.h" />  
48 - <Unit filename="src/gtk/common/config.c"> 48 + <Unit filename="src\gtk\common\common.h" />
  49 + <Unit filename="src\gtk\common\config.c">
49 <Option compilerVar="CC" /> 50 <Option compilerVar="CC" />
50 </Unit> 51 </Unit>
51 - <Unit filename="src/gtk/fonts.c"> 52 + <Unit filename="src\gtk\fonts.c">
52 <Option compilerVar="CC" /> 53 <Option compilerVar="CC" />
53 </Unit> 54 </Unit>
54 - <Unit filename="src/gtk/globals.h" />  
55 - <Unit filename="src/gtk/main.c"> 55 + <Unit filename="src\gtk\globals.h" />
  56 + <Unit filename="src\gtk\main.c">
56 <Option compilerVar="CC" /> 57 <Option compilerVar="CC" />
57 </Unit> 58 </Unit>
58 - <Unit filename="src/gtk/mainwindow.c"> 59 + <Unit filename="src\gtk\mainwindow.c">
59 <Option compilerVar="CC" /> 60 <Option compilerVar="CC" />
60 </Unit> 61 </Unit>
61 - <Unit filename="src/gtk/uiparser/Makefile.in" />  
62 - <Unit filename="src/gtk/uiparser/accelerator.c"> 62 + <Unit filename="src\gtk\uiparser\Makefile.in" />
  63 + <Unit filename="src\gtk\uiparser\accelerator.c">
63 <Option compilerVar="CC" /> 64 <Option compilerVar="CC" />
64 </Unit> 65 </Unit>
65 - <Unit filename="src/gtk/uiparser/action.c"> 66 + <Unit filename="src\gtk\uiparser\action.c">
66 <Option compilerVar="CC" /> 67 <Option compilerVar="CC" />
67 </Unit> 68 </Unit>
68 - <Unit filename="src/gtk/uiparser/menu.c"> 69 + <Unit filename="src\gtk\uiparser\menu.c">
69 <Option compilerVar="CC" /> 70 <Option compilerVar="CC" />
70 </Unit> 71 </Unit>
71 - <Unit filename="src/gtk/uiparser/menubar.c"> 72 + <Unit filename="src\gtk\uiparser\menubar.c">
72 <Option compilerVar="CC" /> 73 <Option compilerVar="CC" />
73 </Unit> 74 </Unit>
74 - <Unit filename="src/gtk/uiparser/menuitem.c"> 75 + <Unit filename="src\gtk\uiparser\menuitem.c">
75 <Option compilerVar="CC" /> 76 <Option compilerVar="CC" />
76 </Unit> 77 </Unit>
77 - <Unit filename="src/gtk/uiparser/parsefile.c"> 78 + <Unit filename="src\gtk\uiparser\parsefile.c">
78 <Option compilerVar="CC" /> 79 <Option compilerVar="CC" />
79 </Unit> 80 </Unit>
80 - <Unit filename="src/gtk/uiparser/parser.c"> 81 + <Unit filename="src\gtk\uiparser\parser.c">
81 <Option compilerVar="CC" /> 82 <Option compilerVar="CC" />
82 </Unit> 83 </Unit>
83 - <Unit filename="src/gtk/uiparser/parser.h" />  
84 - <Unit filename="src/gtk/uiparser/popup.c"> 84 + <Unit filename="src\gtk\uiparser\parser.h" />
  85 + <Unit filename="src\gtk\uiparser\popup.c">
85 <Option compilerVar="CC" /> 86 <Option compilerVar="CC" />
86 </Unit> 87 </Unit>
87 - <Unit filename="src/gtk/uiparser/private.h" />  
88 - <Unit filename="src/gtk/uiparser/script.c"> 88 + <Unit filename="src\gtk\uiparser\private.h" />
  89 + <Unit filename="src\gtk\uiparser\script.c">
89 <Option compilerVar="CC" /> 90 <Option compilerVar="CC" />
90 </Unit> 91 </Unit>
91 - <Unit filename="src/gtk/uiparser/separator.c"> 92 + <Unit filename="src\gtk\uiparser\separator.c">
92 <Option compilerVar="CC" /> 93 <Option compilerVar="CC" />
93 </Unit> 94 </Unit>
94 - <Unit filename="src/gtk/uiparser/sources.mak" />  
95 - <Unit filename="src/gtk/uiparser/testprogram.c"> 95 + <Unit filename="src\gtk\uiparser\sources.mak" />
  96 + <Unit filename="src\gtk\uiparser\testprogram.c">
96 <Option compilerVar="CC" /> 97 <Option compilerVar="CC" />
97 </Unit> 98 </Unit>
98 - <Unit filename="src/gtk/uiparser/toolbar.c"> 99 + <Unit filename="src\gtk\uiparser\toolbar.c">
99 <Option compilerVar="CC" /> 100 <Option compilerVar="CC" />
100 </Unit> 101 </Unit>
101 - <Unit filename="src/gtk/uiparser/toolitem.c"> 102 + <Unit filename="src\gtk\uiparser\toolitem.c">
102 <Option compilerVar="CC" /> 103 <Option compilerVar="CC" />
103 </Unit> 104 </Unit>
104 - <Unit filename="src/gtk/v3270/clipboard.c"> 105 + <Unit filename="src\gtk\v3270\clipboard.c">
105 <Option compilerVar="CC" /> 106 <Option compilerVar="CC" />
106 </Unit> 107 </Unit>
107 - <Unit filename="src/gtk/v3270/draw.c"> 108 + <Unit filename="src\gtk\v3270\draw.c">
108 <Option compilerVar="CC" /> 109 <Option compilerVar="CC" />
109 </Unit> 110 </Unit>
110 - <Unit filename="src/gtk/v3270/genmarshal" />  
111 - <Unit filename="src/gtk/v3270/iocallback.c"> 111 + <Unit filename="src\gtk\v3270\genmarshal" />
  112 + <Unit filename="src\gtk\v3270\iocallback.c">
112 <Option compilerVar="CC" /> 113 <Option compilerVar="CC" />
113 </Unit> 114 </Unit>
114 - <Unit filename="src/gtk/v3270/keyboard.c"> 115 + <Unit filename="src\gtk\v3270\keyboard.c">
115 <Option compilerVar="CC" /> 116 <Option compilerVar="CC" />
116 </Unit> 117 </Unit>
117 - <Unit filename="src/gtk/v3270/mouse.c"> 118 + <Unit filename="src\gtk\v3270\mouse.c">
118 <Option compilerVar="CC" /> 119 <Option compilerVar="CC" />
119 </Unit> 120 </Unit>
120 - <Unit filename="src/gtk/v3270/oia.c"> 121 + <Unit filename="src\gtk\v3270\oia.c">
121 <Option compilerVar="CC" /> 122 <Option compilerVar="CC" />
122 </Unit> 123 </Unit>
123 - <Unit filename="src/gtk/v3270/private.h" />  
124 - <Unit filename="src/gtk/v3270/sources.mak" />  
125 - <Unit filename="src/gtk/v3270/v3270.h" />  
126 - <Unit filename="src/gtk/v3270/widget.c"> 124 + <Unit filename="src\gtk\v3270\private.h" />
  125 + <Unit filename="src\gtk\v3270\sources.mak" />
  126 + <Unit filename="src\gtk\v3270\v3270.h" />
  127 + <Unit filename="src\gtk\v3270\widget.c">
127 <Option compilerVar="CC" /> 128 <Option compilerVar="CC" />
128 </Unit> 129 </Unit>
129 - <Unit filename="src/include/lib3270.h" />  
130 - <Unit filename="src/include/lib3270/action_table.h" />  
131 - <Unit filename="src/include/lib3270/actions.h" />  
132 - <Unit filename="src/include/lib3270/config.h.in" />  
133 - <Unit filename="src/include/lib3270/log.h" />  
134 - <Unit filename="src/include/lib3270/popup.h" />  
135 - <Unit filename="src/include/lib3270/selection.h" />  
136 - <Unit filename="src/include/lib3270/session.h" />  
137 - <Unit filename="src/include/pw3270.h" />  
138 - <Unit filename="src/include/rules.mak.in" />  
139 - <Unit filename="src/lib3270/3270ds.h" />  
140 - <Unit filename="src/lib3270/Makefile.in" />  
141 - <Unit filename="src/lib3270/X11keysym.h" />  
142 - <Unit filename="src/lib3270/XtGlue.c"> 130 + <Unit filename="src\include\lib3270.h" />
  131 + <Unit filename="src\include\lib3270\action_table.h" />
  132 + <Unit filename="src\include\lib3270\actions.h" />
  133 + <Unit filename="src\include\lib3270\config.h.in" />
  134 + <Unit filename="src\include\lib3270\log.h" />
  135 + <Unit filename="src\include\lib3270\popup.h" />
  136 + <Unit filename="src\include\lib3270\selection.h" />
  137 + <Unit filename="src\include\lib3270\session.h" />
  138 + <Unit filename="src\include\pw3270.h" />
  139 + <Unit filename="src\include\rules.mak.in" />
  140 + <Unit filename="src\lib3270\3270ds.h" />
  141 + <Unit filename="src\lib3270\Makefile.in" />
  142 + <Unit filename="src\lib3270\X11keysym.h" />
  143 + <Unit filename="src\lib3270\XtGlue.c">
143 <Option compilerVar="CC" /> 144 <Option compilerVar="CC" />
144 </Unit> 145 </Unit>
145 - <Unit filename="src/lib3270/actions.c"> 146 + <Unit filename="src\lib3270\actions.c">
146 <Option compilerVar="CC" /> 147 <Option compilerVar="CC" />
147 </Unit> 148 </Unit>
148 - <Unit filename="src/lib3270/actionsc.h" />  
149 - <Unit filename="src/lib3270/ansi.c"> 149 + <Unit filename="src\lib3270\actionsc.h" />
  150 + <Unit filename="src\lib3270\ansi.c">
150 <Option compilerVar="CC" /> 151 <Option compilerVar="CC" />
151 </Unit> 152 </Unit>
152 - <Unit filename="src/lib3270/ansic.h" />  
153 - <Unit filename="src/lib3270/api.h" />  
154 - <Unit filename="src/lib3270/apl.c"> 153 + <Unit filename="src\lib3270\ansic.h" />
  154 + <Unit filename="src\lib3270\api.h" />
  155 + <Unit filename="src\lib3270\apl.c">
155 <Option compilerVar="CC" /> 156 <Option compilerVar="CC" />
156 </Unit> 157 </Unit>
157 - <Unit filename="src/lib3270/aplc.h" />  
158 - <Unit filename="src/lib3270/appres.h" />  
159 - <Unit filename="src/lib3270/arpa_telnet.h" />  
160 - <Unit filename="src/lib3270/cg.h" />  
161 - <Unit filename="src/lib3270/charset.c"> 158 + <Unit filename="src\lib3270\aplc.h" />
  159 + <Unit filename="src\lib3270\appres.h" />
  160 + <Unit filename="src\lib3270\arpa_telnet.h" />
  161 + <Unit filename="src\lib3270\cg.h" />
  162 + <Unit filename="src\lib3270\charset.c">
162 <Option compilerVar="CC" /> 163 <Option compilerVar="CC" />
163 </Unit> 164 </Unit>
164 - <Unit filename="src/lib3270/charsetc.h" />  
165 - <Unit filename="src/lib3270/childc.h" />  
166 - <Unit filename="src/lib3270/ctlr.c"> 165 + <Unit filename="src\lib3270\charsetc.h" />
  166 + <Unit filename="src\lib3270\childc.h" />
  167 + <Unit filename="src\lib3270\ctlr.c">
167 <Option compilerVar="CC" /> 168 <Option compilerVar="CC" />
168 </Unit> 169 </Unit>
169 - <Unit filename="src/lib3270/ctlr.h" />  
170 - <Unit filename="src/lib3270/ctlrc.h" />  
171 - <Unit filename="src/lib3270/dialogc.h" />  
172 - <Unit filename="src/lib3270/fallbacks.c"> 170 + <Unit filename="src\lib3270\ctlr.h" />
  171 + <Unit filename="src\lib3270\ctlrc.h" />
  172 + <Unit filename="src\lib3270\dialogc.h" />
  173 + <Unit filename="src\lib3270\fallbacks.c">
173 <Option compilerVar="CC" /> 174 <Option compilerVar="CC" />
174 </Unit> 175 </Unit>
175 - <Unit filename="src/lib3270/ft.c"> 176 + <Unit filename="src\lib3270\ft.c">
176 <Option compilerVar="CC" /> 177 <Option compilerVar="CC" />
177 </Unit> 178 </Unit>
178 - <Unit filename="src/lib3270/ft_cut.c"> 179 + <Unit filename="src\lib3270\ft_cut.c">
179 <Option compilerVar="CC" /> 180 <Option compilerVar="CC" />
180 </Unit> 181 </Unit>
181 - <Unit filename="src/lib3270/ft_cut_ds.h" />  
182 - <Unit filename="src/lib3270/ft_cutc.h" />  
183 - <Unit filename="src/lib3270/ft_dft.c"> 182 + <Unit filename="src\lib3270\ft_cut_ds.h" />
  183 + <Unit filename="src\lib3270\ft_cutc.h" />
  184 + <Unit filename="src\lib3270\ft_dft.c">
184 <Option compilerVar="CC" /> 185 <Option compilerVar="CC" />
185 </Unit> 186 </Unit>
186 - <Unit filename="src/lib3270/ft_dft_ds.h" />  
187 - <Unit filename="src/lib3270/ft_dftc.h" />  
188 - <Unit filename="src/lib3270/ftc.h" />  
189 - <Unit filename="src/lib3270/globals.h" />  
190 - <Unit filename="src/lib3270/glue.c"> 187 + <Unit filename="src\lib3270\ft_dft_ds.h" />
  188 + <Unit filename="src\lib3270\ft_dftc.h" />
  189 + <Unit filename="src\lib3270\ftc.h" />
  190 + <Unit filename="src\lib3270\globals.h" />
  191 + <Unit filename="src\lib3270\glue.c">
191 <Option compilerVar="CC" /> 192 <Option compilerVar="CC" />
192 </Unit> 193 </Unit>
193 - <Unit filename="src/lib3270/gluec.h" />  
194 - <Unit filename="src/lib3270/host.c"> 194 + <Unit filename="src\lib3270\gluec.h" />
  195 + <Unit filename="src\lib3270\host.c">
195 <Option compilerVar="CC" /> 196 <Option compilerVar="CC" />
196 </Unit> 197 </Unit>
197 - <Unit filename="src/lib3270/hostc.h" />  
198 - <Unit filename="src/lib3270/icmdc.h" />  
199 - <Unit filename="src/lib3270/keypadc.h" />  
200 - <Unit filename="src/lib3270/kybd.c"> 198 + <Unit filename="src\lib3270\hostc.h" />
  199 + <Unit filename="src\lib3270\icmdc.h" />
  200 + <Unit filename="src\lib3270\keypadc.h" />
  201 + <Unit filename="src\lib3270\kybd.c">
201 <Option compilerVar="CC" /> 202 <Option compilerVar="CC" />
202 </Unit> 203 </Unit>
203 - <Unit filename="src/lib3270/kybdc.h" />  
204 - <Unit filename="src/lib3270/localdefs.h" />  
205 - <Unit filename="src/lib3270/log.c"> 204 + <Unit filename="src\lib3270\kybdc.h" />
  205 + <Unit filename="src\lib3270\localdefs.h" />
  206 + <Unit filename="src\lib3270\log.c">
206 <Option compilerVar="CC" /> 207 <Option compilerVar="CC" />
207 </Unit> 208 </Unit>
208 - <Unit filename="src/lib3270/macros.c"> 209 + <Unit filename="src\lib3270\macros.c">
209 <Option compilerVar="CC" /> 210 <Option compilerVar="CC" />
210 </Unit> 211 </Unit>
211 - <Unit filename="src/lib3270/mkfb.c"> 212 + <Unit filename="src\lib3270\mkfb.c">
212 <Option compilerVar="CC" /> 213 <Option compilerVar="CC" />
213 </Unit> 214 </Unit>
214 - <Unit filename="src/lib3270/objects.h" />  
215 - <Unit filename="src/lib3270/paste.c"> 215 + <Unit filename="src\lib3270\objects.h" />
  216 + <Unit filename="src\lib3270\paste.c">
216 <Option compilerVar="CC" /> 217 <Option compilerVar="CC" />
217 </Unit> 218 </Unit>
218 - <Unit filename="src/lib3270/popupsc.h" />  
219 - <Unit filename="src/lib3270/print.c"> 219 + <Unit filename="src\lib3270\popupsc.h" />
  220 + <Unit filename="src\lib3270\print.c">
220 <Option compilerVar="CC" /> 221 <Option compilerVar="CC" />
221 </Unit> 222 </Unit>
222 - <Unit filename="src/lib3270/printc.h" />  
223 - <Unit filename="src/lib3270/printer.c"> 223 + <Unit filename="src\lib3270\printc.h" />
  224 + <Unit filename="src\lib3270\printer.c">
224 <Option compilerVar="CC" /> 225 <Option compilerVar="CC" />
225 </Unit> 226 </Unit>
226 - <Unit filename="src/lib3270/printerc.h" />  
227 - <Unit filename="src/lib3270/proxy.c"> 227 + <Unit filename="src\lib3270\printerc.h" />
  228 + <Unit filename="src\lib3270\proxy.c">
228 <Option compilerVar="CC" /> 229 <Option compilerVar="CC" />
229 </Unit> 230 </Unit>
230 - <Unit filename="src/lib3270/proxyc.h" />  
231 - <Unit filename="src/lib3270/resolver.c"> 231 + <Unit filename="src\lib3270\proxyc.h" />
  232 + <Unit filename="src\lib3270\resolver.c">
232 <Option compilerVar="CC" /> 233 <Option compilerVar="CC" />
233 </Unit> 234 </Unit>
234 - <Unit filename="src/lib3270/resolverc.h" />  
235 - <Unit filename="src/lib3270/resources.c"> 235 + <Unit filename="src\lib3270\resolverc.h" />
  236 + <Unit filename="src\lib3270\resources.c">
236 <Option compilerVar="CC" /> 237 <Option compilerVar="CC" />
237 </Unit> 238 </Unit>
238 - <Unit filename="src/lib3270/resources.h" />  
239 - <Unit filename="src/lib3270/rpq.c"> 239 + <Unit filename="src\lib3270\resources.h" />
  240 + <Unit filename="src\lib3270\rpq.c">
240 <Option compilerVar="CC" /> 241 <Option compilerVar="CC" />
241 </Unit> 242 </Unit>
242 - <Unit filename="src/lib3270/savec.h" />  
243 - <Unit filename="src/lib3270/screen.c"> 243 + <Unit filename="src\lib3270\savec.h" />
  244 + <Unit filename="src\lib3270\screen.c">
244 <Option compilerVar="CC" /> 245 <Option compilerVar="CC" />
245 </Unit> 246 </Unit>
246 - <Unit filename="src/lib3270/screen.h" />  
247 - <Unit filename="src/lib3270/screenc.h" />  
248 - <Unit filename="src/lib3270/scrollc.h" />  
249 - <Unit filename="src/lib3270/see.c"> 247 + <Unit filename="src\lib3270\screen.h" />
  248 + <Unit filename="src\lib3270\screenc.h" />
  249 + <Unit filename="src\lib3270\scrollc.h" />
  250 + <Unit filename="src\lib3270\see.c">
250 <Option compilerVar="CC" /> 251 <Option compilerVar="CC" />
251 </Unit> 252 </Unit>
252 - <Unit filename="src/lib3270/seec.h" />  
253 - <Unit filename="src/lib3270/selection.c"> 253 + <Unit filename="src\lib3270\seec.h" />
  254 + <Unit filename="src\lib3270\selection.c">
254 <Option compilerVar="CC" /> 255 <Option compilerVar="CC" />
255 </Unit> 256 </Unit>
256 - <Unit filename="src/lib3270/sf.c"> 257 + <Unit filename="src\lib3270\sf.c">
257 <Option compilerVar="CC" /> 258 <Option compilerVar="CC" />
258 </Unit> 259 </Unit>
259 - <Unit filename="src/lib3270/sfc.h" />  
260 - <Unit filename="src/lib3270/shlobj_missing.h" />  
261 - <Unit filename="src/lib3270/statusc.h" />  
262 - <Unit filename="src/lib3270/tables.c"> 260 + <Unit filename="src\lib3270\sfc.h" />
  261 + <Unit filename="src\lib3270\shlobj_missing.h" />
  262 + <Unit filename="src\lib3270\statusc.h" />
  263 + <Unit filename="src\lib3270\tables.c">
263 <Option compilerVar="CC" /> 264 <Option compilerVar="CC" />
264 </Unit> 265 </Unit>
265 - <Unit filename="src/lib3270/tablesc.h" />  
266 - <Unit filename="src/lib3270/telnet.c"> 266 + <Unit filename="src\lib3270\tablesc.h" />
  267 + <Unit filename="src\lib3270\telnet.c">
267 <Option compilerVar="CC" /> 268 <Option compilerVar="CC" />
268 </Unit> 269 </Unit>
269 - <Unit filename="src/lib3270/telnetc.h" />  
270 - <Unit filename="src/lib3270/testprogram.c"> 270 + <Unit filename="src\lib3270\telnetc.h" />
  271 + <Unit filename="src\lib3270\testprogram.c">
271 <Option compilerVar="CC" /> 272 <Option compilerVar="CC" />
272 </Unit> 273 </Unit>
273 - <Unit filename="src/lib3270/tn3270e.h" />  
274 - <Unit filename="src/lib3270/toggle.h" />  
275 - <Unit filename="src/lib3270/toggles.c"> 274 + <Unit filename="src\lib3270\tn3270e.h" />
  275 + <Unit filename="src\lib3270\toggle.h" />
  276 + <Unit filename="src\lib3270\toggles.c">
276 <Option compilerVar="CC" /> 277 <Option compilerVar="CC" />
277 </Unit> 278 </Unit>
278 - <Unit filename="src/lib3270/togglesc.h" />  
279 - <Unit filename="src/lib3270/trace_ds.c"> 279 + <Unit filename="src\lib3270\togglesc.h" />
  280 + <Unit filename="src\lib3270\trace_ds.c">
280 <Option compilerVar="CC" /> 281 <Option compilerVar="CC" />
281 </Unit> 282 </Unit>
282 - <Unit filename="src/lib3270/trace_dsc.h" />  
283 - <Unit filename="src/lib3270/utf8.c"> 283 + <Unit filename="src\lib3270\trace_dsc.h" />
  284 + <Unit filename="src\lib3270\utf8.c">
284 <Option compilerVar="CC" /> 285 <Option compilerVar="CC" />
285 </Unit> 286 </Unit>
286 - <Unit filename="src/lib3270/utf8c.h" />  
287 - <Unit filename="src/lib3270/util.c"> 287 + <Unit filename="src\lib3270\utf8c.h" />
  288 + <Unit filename="src\lib3270\util.c">
288 <Option compilerVar="CC" /> 289 <Option compilerVar="CC" />
289 </Unit> 290 </Unit>
290 - <Unit filename="src/lib3270/utilc.h" />  
291 - <Unit filename="src/lib3270/version.c"> 291 + <Unit filename="src\lib3270\utilc.h" />
  292 + <Unit filename="src\lib3270\version.c">
292 <Option compilerVar="CC" /> 293 <Option compilerVar="CC" />
293 </Unit> 294 </Unit>
294 - <Unit filename="src/lib3270/w3misc.c"> 295 + <Unit filename="src\lib3270\w3misc.c">
295 <Option compilerVar="CC" /> 296 <Option compilerVar="CC" />
296 </Unit> 297 </Unit>
297 - <Unit filename="src/lib3270/w3miscc.h" />  
298 - <Unit filename="src/lib3270/widec.h" />  
299 - <Unit filename="src/lib3270/winvers.c"> 298 + <Unit filename="src\lib3270\w3miscc.h" />
  299 + <Unit filename="src\lib3270\widec.h" />
  300 + <Unit filename="src\lib3270\winvers.c">
300 <Option compilerVar="CC" /> 301 <Option compilerVar="CC" />
301 </Unit> 302 </Unit>
302 - <Unit filename="src/lib3270/winversc.h" />  
303 - <Unit filename="src/lib3270/xio.c"> 303 + <Unit filename="src\lib3270\winversc.h" />
  304 + <Unit filename="src\lib3270\xio.c">
304 <Option compilerVar="CC" /> 305 <Option compilerVar="CC" />
305 </Unit> 306 </Unit>
306 - <Unit filename="src/lib3270/xioc.h" />  
307 - <Unit filename="src/lib3270/xl.h" />  
308 - <Unit filename="ui/00default.xml" />  
309 - <Unit filename="ui/99debug.xml" /> 307 + <Unit filename="src\lib3270\xioc.h" />
  308 + <Unit filename="src\lib3270\xl.h" />
  309 + <Unit filename="ui\00default.xml" />
  310 + <Unit filename="ui\99debug.xml" />
310 <Unit filename="valgrind.suppression" /> 311 <Unit filename="valgrind.suppression" />
311 <Extensions> 312 <Extensions>
312 <code_completion /> 313 <code_completion />
pw3270.spec.in
  Diff comments   View file @4288039
@@ -57,10 +57,10 @@ License: LGPL @@ -57,10 +57,10 @@ License: LGPL
57 Group: System/X11/Terminals 57 Group: System/X11/Terminals
58 Version: @PACKAGE_VERSION@ 58 Version: @PACKAGE_VERSION@
59 Release: %_release 59 Release: %_release
60 -Summary: IBM 3270 Terminal emulator for gtk. 60 +Summary: IBM 3270 Terminal emulator for gtk
61 Source: %{name}-%{version}.tar.gz 61 Source: %{name}-%{version}.tar.gz
62 BuildRoot: %{_tmppath}/%{name}-%{version}-build 62 BuildRoot: %{_tmppath}/%{name}-%{version}-build
63 -Requires: openssl shared-mime-info libgnome libgnomeui 63 +Requires: openssl shared-mime-info
64 Distribution: %_distro 64 Distribution: %_distro
65 BuildRequires: autoconf automake gcc-c++ sed pkgconfig gtk2-devel libgnome-devel gettext-devel libopenssl-devel findutils 65 BuildRequires: autoconf automake gcc-c++ sed pkgconfig gtk2-devel libgnome-devel gettext-devel libopenssl-devel findutils
66 66
@@ -98,7 +98,14 @@ rm -rf $RPM_BUILD_ROOT @@ -98,7 +98,14 @@ rm -rf $RPM_BUILD_ROOT
98 %files 98 %files
99 %defattr(-,root,root) 99 %defattr(-,root,root)
100 %doc AUTHORS LICENSE 100 %doc AUTHORS LICENSE
  101 +
  102 +# Library
101 %{_libdir}/lib3270.so 103 %{_libdir}/lib3270.so
  104 +
  105 +# Main application
  106 +%dir %{_datadir}/@PACKAGE_NAME@
  107 +%dir %{_datadir}/@PACKAGE_NAME@/ui
  108 +
102 %{_bindir}/@PACKAGE_NAME@ 109 %{_bindir}/@PACKAGE_NAME@
103 %{_datadir}/@PACKAGE_NAME@/ui/00default.xml 110 %{_datadir}/@PACKAGE_NAME@/ui/00default.xml
104 %{_datadir}/@PACKAGE_NAME@/ui/99debug.xml 111 %{_datadir}/@PACKAGE_NAME@/ui/99debug.xml
src/lib3270/Makefile.in
  Diff comments   View file @4288039
@@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
28 28
29 PACKAGE=@PACKAGE_NAME@ 29 PACKAGE=@PACKAGE_NAME@
30 30
31 -CFLAGS=@CFLAGS@ -DAPPDATA=\"$(datarootdir)/$(PACKAGE_NAME)\" -I../../src/include 31 +CFLAGS=@CFLAGS@ @DLL_CFLAGS@ -DAPPDATA=\"$(datarootdir)/$(PACKAGE_NAME)\" -I../../src/include
32 SSL_CFLAGS=@LIBSSL_CFLAGS@ 32 SSL_CFLAGS=@LIBSSL_CFLAGS@
33 33
34 DLL_FLAGS=@DLL_FLAGS@ 34 DLL_FLAGS=@DLL_FLAGS@