Commit ba3ac6c2bfd3679a44bee9e8cf153796eee9023b

Authored by Perry Werneck
1 parent 193c8790

Implementando uso de submódulo para a lib3270 no projeto principal.

Showing 1 changed file with 33 additions and 340 deletions   Show diff stats
@@ -47,375 +47,68 @@ sysconfdir=@sysconfdir@ @@ -47,375 +47,68 @@ sysconfdir=@sysconfdir@
47 mandir=@mandir@ 47 mandir=@mandir@
48 48
49 BASEDIR=@BASEDIR@ 49 BASEDIR=@BASEDIR@
50 -SRCDIR=$(BASEDIR)/.src/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)  
51 -POTDIR=$(BASEDIR)/.pot  
52 50
  51 +POTDIR=$(BASEDIR)/.pot
53 BINDIR=$(BASEDIR)/.bin 52 BINDIR=$(BASEDIR)/.bin
54 BINDBG=$(BINDIR)/Debug 53 BINDBG=$(BINDIR)/Debug
55 BINRLS=$(BINDIR)/Release 54 BINRLS=$(BINDIR)/Release
56 55
57 #---[ Tools ]------------------------------------------------------------------ 56 #---[ Tools ]------------------------------------------------------------------
58 57
  58 +CC=@CC@
  59 +LD=@CC@
  60 +LN_S=@LN_S@
  61 +MKDIR=@MKDIR_P@
59 INSTALL=@INSTALL@ 62 INSTALL=@INSTALL@
60 INSTALL_DATA=@INSTALL_DATA@ 63 INSTALL_DATA=@INSTALL_DATA@
61 INSTALL_PROGRAM=@INSTALL_PROGRAM@ 64 INSTALL_PROGRAM=@INSTALL_PROGRAM@
62 -MKDIR=@MKDIR_P@  
63 -MSGCAT=@MSGCAT@  
64 -AMTAR=@AMTAR@  
65 -RPMBUILD=@RPMBUILD@  
66 -HELP2MAN=@HELP2MAN@  
67 -  
68 -#---[ Rules ]------------------------------------------------------------------  
69 -  
70 -DEPENDS=$(BASEDIR)/src/include/*.h $(BASEDIR)/src/include/lib3270/*.h $(BASEDIR)/src/include/pw3270/*.h Makefile  
71 -  
72 -$(BINDBG)/%@DLLEXT@: \  
73 - $(DEPENDS) \  
74 - ./src/%/*  
75 -  
76 - @$(MAKE) -C src/$(basename $(notdir $@)) $@  
77 -  
78 -$(BINDBG)/lib@LIB3270_NAME@@DLLEXT@: \  
79 - $(DEPENDS) \  
80 - ./src/lib3270/*  
81 -  
82 - @$(MAKE) -C src/lib3270 $@  
83 -  
84 -$(BINDBG)/plugins/%@DLLEXT@: \  
85 - $(DEPENDS) \  
86 - ./src/plugins/%/*  
87 -  
88 - @$(MAKE) -C src/plugins/$(basename $(notdir $@)) $@  
89 -  
90 -$(BINDBG)/%@EXEEXT@: \  
91 - $(DEPENDS) \  
92 - ./src/%/*  
93 -  
94 - @$(MAKE) -C src/$(basename $(notdir $@)) $@  
95 -  
96 -$(BINRLS)/%@DLLEXT@: \  
97 - $(DEPENDS) \  
98 - ./src/%/*  
99 -  
100 - @$(MAKE) -C src/$(basename $(notdir $@)) $@  
101 -  
102 -$(BINRLS)/lib@LIB3270_NAME@@DLLEXT@: \  
103 - $(DEPENDS) \  
104 - ./src/lib3270/*  
105 -  
106 - @$(MAKE) -C src/lib3270 $@  
107 -  
108 -$(BINRLS)/%.a: \  
109 - $(DEPENDS) \  
110 - ./src/%/*  
111 -  
112 - @$(MAKE) -C src/$(basename $(notdir $@)) $@  
113 -  
114 -$(BINRLS)/plugins/%@DLLEXT@: \  
115 - $(DEPENDS) \  
116 - $(BINRLS)/libpw3270cpp.a \  
117 - ./src/plugins/%/*  
118 -  
119 - @$(MAKE) -C src/plugins/$(basename $(notdir $@)) $@  
120 -  
121 -$(POTDIR)/%.pot: \  
122 - $(DEPENDS) \  
123 - ./src/%/*  
124 -  
125 - @$(MAKE) -C src/$(basename $(notdir $@)) $@  
126 -  
127 -$(POTDIR)/%.pot: \  
128 - ./%/*  
129 -  
130 - @$(MAKE) -C $(basename $(notdir $@)) $@  
131 -  
132 -$(POTDIR)/plugins/%.pot: \  
133 - $(DEPENDS) \  
134 - ./src/plugins/%/*  
135 -  
136 - @$(MAKE) -C src/plugins/$(basename $(notdir $@)) $@  
137 -  
138 -$(DESTDIR)$(libdir)/%@DLLEXT@: \  
139 - $(DEPENDS) \  
140 - ./src/%/*  
141 -  
142 - @$(MAKE) DESTDIR=$(DESTDIR) -C src/$(basename $(notdir $@)) install  
143 65
144 -$(DESTDIR)$(libdir)/%.a: \  
145 - $(DEPENDS) \  
146 - ./src/%/*  
147 -  
148 - @$(MAKE) DESTDIR=$(DESTDIR) -C src/$(basename $(notdir $@)) $@  
149 -  
150 -  
151 -$(DESTDIR)$(libdir)/$(PACKAGE_TARNAME)-plugins/%@DLLEXT@: \  
152 - $(DEPENDS) \  
153 - ./src/plugins/%/*  
154 -  
155 - @$(MAKE) -C src/plugins/$(basename $(notdir $@)) $@  
156 -  
157 -$(BINRLS)/%@EXEEXT@: \  
158 - $(DEPENDS) \  
159 - ./src/%/*  
160 -  
161 - @$(MAKE) -C src/$(basename $(notdir $@)) $@  
162 -  
163 -$(DESTDIR)$(bindir)/%@EXEEXT@: \  
164 - $(DEPENDS) \  
165 - ./src/%/*  
166 -  
167 - @$(MAKE) DESTDIR=$(DESTDIR) -C src/$(basename $(notdir $@)) install  
168 -  
169 -$(SRCDIR)/%: \  
170 - %/Makefile  
171 -  
172 - @make -C `dirname $<` $@  
173 -  
174 -$(BINDIR)/%.png: \  
175 - branding/%.svg  
176 -  
177 - @$(MAKE) -C branding $@  
178 -  
179 -$(BINDIR)/%.png: \  
180 - branding/%.png  
181 -  
182 - @$(MAKE) -C branding $@  
183 -  
184 -  
185 -%.tar.bz2: \  
186 - %.tar  
187 -  
188 - @echo $< ...  
189 - @bzip2 --compress -9 --stdout $< > $@  
190 - @chmod 0644 $@  
191 -  
192 -%.tar.gz: \  
193 - %.tar  
194 -  
195 - @echo $< ...  
196 - @gzip -9 --stdout $< > $@  
197 - @chmod 0644 $@  
198 -  
199 -  
200 -#---[ Release targets ]-------------------------------------------------------- 66 +#---[ Release Targets ]------------------------------------------------------------------
201 67
202 all: \ 68 all: \
203 - $(BINRLS)/lib@LIB3270_NAME@@DLLEXT@ \  
204 - $(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@ \  
205 - $(BINRLS)/libpw3270cpp.a \  
206 - $(foreach PLG, $(PLUGINS), $(BINRLS)/plugins/$(PLG)@DLLEXT@) \  
207 - $(BINDIR)/$(PACKAGE_NAME).png \  
208 - $(BINDIR)/$(PACKAGE_NAME)-logo.png \  
209 - locale/$(PACKAGE_TARNAME).pot  
210 -  
211 - @$(MAKE) -C locale all 69 + $(BINRLS)/@DLLPREFIX@3270@DLLEXT@ \
  70 + $(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@
212 71
213 Release: \ 72 Release: \
214 - $(BINRLS)/lib@LIB3270_NAME@@DLLEXT@ \  
215 - $(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@ \  
216 - $(foreach PLG, $(PLUGINS), $(BINRLS)/plugins/$(PLG)@DLLEXT@) \  
217 - $(BINDIR)/$(PACKAGE_NAME).png \  
218 - $(BINDIR)/$(PACKAGE_NAME)-logo.png \  
219 - locale/$(PACKAGE_TARNAME).pot 73 + $(BINRLS)/@DLLPREFIX@3270@DLLEXT@ \
  74 + $(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@
220 75
221 - @$(MAKE) -C locale all  
222 76
223 -locale/$(PACKAGE_TARNAME).pot: \  
224 - $(POTDIR)/lib@LIB3270_NAME@.pot \  
225 - $(POTDIR)/pw3270.pot \  
226 - $(POTDIR)/ui.pot \  
227 - $(foreach PLG, $(PLUGINS), $(POTDIR)/plugins/$(PLG).pot) 77 +$(BINRLS)/@DLLPREFIX@3270@DLLEXT@: \
  78 + submodules/lib3270/* \
  79 + submodules/lib3270/src/lib3270/* \
  80 + submodules/lib3270/src/include/*
228 81
229 - @rm -f $@  
230 - @mkdir -p `dirname $@`  
231 - @$(MSGCAT) --sort-output $^ > $@ 82 + @$(MKDIR) `dirname $@`
  83 + $(MAKE) -C submodules/lib3270 Release
232 84
233 -install: \  
234 - install-lib \  
235 - install-app \  
236 - install-sdk \  
237 - $(foreach PLG, $(PLUGINS), $(DESTDIR)$(libdir)/$(PACKAGE_TARNAME)-plugins/$(PLG)@DLLEXT@) 85 + @cp ./submodules/lib3270/.bin/lib3270/Debug/* $(BINRLS)
238 86
239 -install-lib: \  
240 - $(DESTDIR)$(libdir)/lib@LIB3270_NAME@@DLLEXT@ \ 87 +#---[ Debug Rules ]----------------------------------------------------------------------
241 88
242 -install-app: \  
243 - install-branding \  
244 - $(DESTDIR)$(bindir)/$(PACKAGE_TARNAME)@EXEEXT@ \  
245 - locale/$(PACKAGE_TARNAME).pot 89 +$(BINDBG)/@DLLPREFIX@3270@DLLEXT@: \
  90 + submodules/lib3270/* \
  91 + submodules/lib3270/src/lib3270/* \
  92 + submodules/lib3270/src/include/*
246 93
247 - @$(MKDIR) $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)  
248 - @$(INSTALL_DATA) conf/colors.conf $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME) 94 + @$(MKDIR) `dirname $@`
  95 + $(MAKE) -C submodules/lib3270 Debug
249 96
250 - @$(MAKE) -C ui install  
251 - @$(MAKE) -C charsets install  
252 - @$(MAKE) -C locale install 97 + @cp ./submodules/lib3270/.bin/lib3270/Debug/* $(BINDBG)
253 98
254 -ifneq ($(HELP2MAN),no)  
255 - @$(MKDIR) $(DESTDIR)/$(mandir)/man1  
256 - @$(HELP2MAN) \  
257 - --version-string="$(PACKAGE_TARNAME) - $(PACKAGE_DESCRIPTION) Vrs. $(PACKAGE_VERSION)" \  
258 - $(DESTDIR)$(bindir)/$(PACKAGE_TARNAME)@EXEEXT@ | gzip --best --stdout - > $(DESTDIR)/$(mandir)/man1/$(PACKAGE_NAME).1.gz  
259 -endif  
260 -  
261 -  
262 -$(BINRLS)/libpw3270cpp.a: \  
263 - src/libpw3270cpp/*  
264 -  
265 - @$(MAKE) -C src/libpw3270cpp Release  
266 -  
267 -install-sdk:  
268 -  
269 - @$(MAKE) -C sdk install  
270 - @$(MAKE) -C src/libpw3270cpp install 99 +$(BINDBG)/%@EXEEXT@: \
  100 + $(BINDBG)/@DLLPREFIX@3270@DLLEXT@ \
  101 + src/% \
  102 + src/%/*
271 103
272 -install-branding: 104 + @make -C src/$(notdir $(basename $@)) $@
273 105
274 - @$(MAKE) -C branding install  
275 106
276 -#---[ Debug targets ]---------------------------------------------------------- 107 +#---[ Debug Targets ]--------------------------------------------------------------------
277 108
278 Debug: \ 109 Debug: \
279 - $(BINDBG)/lib@LIB3270_NAME@@DLLEXT@ \  
280 - $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@ \  
281 - $(BINDBG)/libpw3270cpp.a \  
282 - $(foreach PLG, $(PLUGINS), $(BINDBG)/plugins/$(PLG)@DLLEXT@)  
283 -  
284 -$(BINDBG)/libpw3270cpp.a: \  
285 - src/libpw3270cpp/*  
286 -  
287 - @$(MAKE) -C src/libpw3270cpp Debug  
288 -  
289 -  
290 -run: \  
291 - $(BINDBG)/lib@LIB3270_NAME@@DLLEXT@ \  
292 - $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@ \  
293 - $(foreach PLG, $(PLUGINS), $(BINDBG)/plugins/$(PLG)@DLLEXT@)  
294 -  
295 - @LD_LIBRARY_PATH=$(BINDBG) $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@  
296 -  
297 -#---[ Package Targets ]--------------------------------------------------------  
298 -  
299 -tgz: \  
300 - $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz  
301 -  
302 -bz2: \  
303 - $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.bz2  
304 -  
305 -tar: \  
306 - $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar  
307 -  
308 -rpm: \  
309 - $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.bz2  
310 -  
311 - @$(MKDIR) $(BASEDIR)/rpm  
312 - @$(MKDIR) $(BASEDIR)/rpm/SPECS  
313 - @$(MKDIR) $(BASEDIR)/rpm/SOURCES  
314 - @$(MKDIR) $(BASEDIR)/rpm/SRPMS  
315 - @$(MKDIR) $(BASEDIR)/rpm/RPMS  
316 - @$(MKDIR) $(BASEDIR)/rpm/BUILD  
317 - @$(MKDIR) $(BASEDIR)/rpm/BUILDROOT  
318 - @umask 002 ; $(RPMBUILD) \  
319 - --define="_topdir $(BASEDIR)/rpm" \  
320 - --define="_packager $(USER)@$(HOSTNAME)" \  
321 - --clean \  
322 - -ta $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.bz2  
323 -  
324 -$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar: \  
325 - $(SRCDIR)  
326 -  
327 - @$(AMTAR) \  
328 - --verbose \  
329 - --format=ustar \  
330 - --create \  
331 - --exclude-vcs \  
332 - --directory $(BASEDIR)/.src \  
333 - --owner=root \  
334 - --group=root \  
335 - --file=$@ \  
336 - $(PACKAGE_TARNAME)-@PACKAGE_VERSION@  
337 -  
338 -$(SRCDIR): \  
339 - clean \  
340 - $(SRCDIR)/ui \  
341 - $(SRCDIR)/charsets \  
342 - $(SRCDIR)/src/lib3270 \  
343 - $(SRCDIR)/src/pw3270 \  
344 - $(SRCDIR)/src/libpw3270cpp \  
345 - $(SRCDIR)/sdk \  
346 - $(SRCDIR)/branding \  
347 - $(SRCDIR)/src/plugins/dbus3270 \  
348 - $(SRCDIR)/src/plugins/hllapi  
349 -  
350 -  
351 - @$(MKDIR) $(SRCDIR)  
352 - @$(INSTALL_DATA) \  
353 - *.in configure.ac *.cbp LICENCA LICENSE AUTHORS README.md \  
354 - $(SRCDIR)  
355 -  
356 - @$(MKDIR) $(SRCDIR)/win  
357 - @$(INSTALL_DATA) \  
358 - win/*.in \  
359 - $(SRCDIR)/win  
360 -  
361 - @$(INSTALL_PROGRAM) \  
362 - autogen.sh \  
363 - $(SRCDIR)  
364 -  
365 - @$(MKDIR) $(SRCDIR)/locale  
366 - @$(INSTALL_DATA) \  
367 - locale/*.po \  
368 - locale/*.in \  
369 - $(SRCDIR)/locale  
370 -  
371 - @$(MKDIR) $(SRCDIR)/conf  
372 - @$(INSTALL_DATA) \  
373 - conf/*.conf \  
374 - $(SRCDIR)/conf  
375 -  
376 - @$(MKDIR) $(SRCDIR)/rpm  
377 - @$(INSTALL_DATA) \  
378 - rpm/*.spec \  
379 - $(SRCDIR)/rpm  
380 -  
381 - @$(MKDIR) $(SRCDIR)/debian  
382 - @$(INSTALL_DATA) \  
383 - debian/* \  
384 - $(SRCDIR)/debian  
385 -  
386 - @$(MKDIR) $(SRCDIR)/scripts  
387 - @$(INSTALL_DATA) \  
388 - scripts/* \  
389 - $(SRCDIR)/scripts  
390 -  
391 - @$(INSTALL_DATA) \  
392 - rpm/*.spec \  
393 - $(SRCDIR)  
394 -  
395 -  
396 -#---[ Clean Targets ]----------------------------------------------------------$(  
397 -  
398 -cleanDebug:  
399 -  
400 - @$(MAKE) -C src/lib3270 cleanDebug  
401 - @$(MAKE) -C src/pw3270 cleanDebug  
402 - @$(MAKE) -C ui cleanDebug  
403 -  
404 -cleanRelease:  
405 -  
406 - @$(MAKE) -C src/lib3270 cleanRelease  
407 - @$(MAKE) -C src/pw3270 cleanRelease  
408 - @$(MAKE) -C ui cleanRelease  
409 -  
410 -  
411 -clean: \  
412 - cleanDebug \  
413 - cleanRelease  
414 -  
415 - @rm -fr $(BINDIR)  
416 - @rm -fr $(POTDIR)  
417 - @rm -fr $(SRCDIR)  
418 - @rm -fr $(BASEDIR)/.obj 110 + $(BINDBG)/@DLLPREFIX@3270@DLLEXT@ \
  111 + $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@
419 112
420 113
421 114