Download as
Browse Code »

Commit d5e08b6ad617ac98b27834b99cd32bd383f63ea3

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

Atualizando criação de .rpm

Showing 2 changed files with 5 additions and 34 deletions   Show diff stats
@@ -109,12 +109,6 @@ ifneq ($(CONVERT),no) @@ -109,12 +109,6 @@ ifneq ($(CONVERT),no)
109 @$(CONVERT) --format=png --output=$@ $< 109 @$(CONVERT) --format=png --output=$@ $<
110 endif 110 endif
111 111
112 -debian/%.install: src/%/Makefile  
113 - @$(MAKE) DEBDIR=../../debian -C $(dir $^) ../../$@  
114 -  
115 -debian/%.install: src/plugins/%/Makefile  
116 - @$(MAKE) DEBDIR=../../../debian -C $(dir $^) ../../../$@  
117 -  
118 $(BINDIR)/pot/%.pot: src/%/Makefile 112 $(BINDIR)/pot/%.pot: src/%/Makefile
119 @$(MAKE) BINDIR=../../$(BINDIR) -C $(dir $^) ../../$@ 113 @$(MAKE) BINDIR=../../$(BINDIR) -C $(dir $^) ../../$@
120 114
@@ -147,7 +141,7 @@ all: Release @@ -147,7 +141,7 @@ all: Release
147 141
148 Release: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) $(foreach PLUGIN, $(PLUGINS), $(BINDIR)/Release/plugins/$(PLUGIN)@DLLEXT@) \ 142 Release: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) $(foreach PLUGIN, $(PLUGINS), $(BINDIR)/Release/plugins/$(PLUGIN)@DLLEXT@) \
149 $(foreach EXT, $(EXTENSIONS), $(EXT)) \ 143 $(foreach EXT, $(EXTENSIONS), $(EXT)) \
150 - locale pixmaps filelist 144 + locale pixmaps
151 145
152 $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT): src/pw3270/* $(BINDIR)/Release@DLLDIR@/lib3270@DLLEXT@ $(DEPENDS) 146 $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT): src/pw3270/* $(BINDIR)/Release@DLLDIR@/lib3270@DLLEXT@ $(DEPENDS)
153 @$(MAKE) BINDIR="../../$(BINDIR)" LIB3270_LIBS="$(RLSLIB)" LIB3270_CFLAGS="-I../../src/include" -C src/pw3270 ../../$(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) 147 @$(MAKE) BINDIR="../../$(BINDIR)" LIB3270_LIBS="$(RLSLIB)" LIB3270_CFLAGS="-I../../src/include" -C src/pw3270 ../../$(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT)
@@ -160,25 +154,6 @@ oxt: $(BINDIR)/$(PACKAGE_TARNAME).oxt @@ -160,25 +154,6 @@ oxt: $(BINDIR)/$(PACKAGE_TARNAME).oxt
160 $(BINDIR)/$(PACKAGE_TARNAME).oxt: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) 154 $(BINDIR)/$(PACKAGE_TARNAME).oxt: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT)
161 @$(MAKE) BINDIR=../../.bin LIB3270_CFLAGS="-I../../src/include" -C src/oxt ../../.bin/$(PACKAGE_TARNAME).oxt 155 @$(MAKE) BINDIR=../../.bin LIB3270_CFLAGS="-I../../src/include" -C src/oxt ../../.bin/$(PACKAGE_TARNAME).oxt
162 156
163 -#---[ File lists ]-------------------------------------------------------------  
164 -  
165 -filelist: debian/lib3270-dev.install debian/lib3270.install debian/lib3270-dev.install debian/pw3270.install \  
166 - $(foreach PLUGIN, $(PLUGINS) $(EXTENSIONS), debian/$(PLUGIN).install)  
167 -  
168 -debian/lib3270-dev.install: Makefile  
169 - @echo " GEN `basename $@`"  
170 - @$(MKDIR) `dirname $@`  
171 - @echo "$(includedir)/lib3270.h" > $@  
172 - @echo "$(includedir)/lib3270" >> $@  
173 - @echo "$(datarootdir)/@PACKAGE_NAME@/ui/99debug.xml" >> $@  
174 - @echo "$(datarootdir)/@PACKAGE_NAME@/sample/*.c" >> $@  
175 - @echo "$(datarootdir)/@PACKAGE_NAME@/sample/Makefile" >> $@  
176 - @echo "$(libdir)/pkgconfig/*.pc" >> $@  
177 - @echo "$(includedir)/pw3270.h" >> $@  
178 - @echo "$(includedir)/pw3270" >> $@  
179 - @echo "$(libdir)/lib3270.so" >> $@  
180 - @echo "$(libdir)/libpw3270.so" >> $@  
181 -  
182 #---[ Debug targets ]---------------------------------------------------------- 157 #---[ Debug targets ]----------------------------------------------------------
183 158
184 Debug: $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT) \ 159 Debug: $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT) \
@@ -260,9 +235,8 @@ $(TMPDIR)/$(PACKAGE_NAME).pot: $(BINDIR)/pot/pw3270.pot $(BINDIR)/pot/lib3270.po @@ -260,9 +235,8 @@ $(TMPDIR)/$(PACKAGE_NAME).pot: $(BINDIR)/pot/pw3270.pot $(BINDIR)/pot/lib3270.po
260 235
261 pixmaps: src/pw3270/$(PACKAGE_NAME).png src/pw3270/$(PACKAGE_NAME)-logo.png 236 pixmaps: src/pw3270/$(PACKAGE_NAME).png src/pw3270/$(PACKAGE_NAME)-logo.png
262 237
263 -$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar: clean pixmaps filelist 238 +$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar: clean pixmaps
264 @rm -fr $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION) 239 @rm -fr $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
265 -# @find src -name Makefile -exec rm -f {} \;  
266 @$(MKDIR) $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION) 240 @$(MKDIR) $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
267 @NOCONFIGURE=1 ./autogen.sh $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION) 241 @NOCONFIGURE=1 ./autogen.sh $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
268 @cp *.m4 $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION) 242 @cp *.m4 $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
@@ -276,18 +250,15 @@ $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar: clean pixmaps filelist @@ -276,18 +250,15 @@ $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar: clean pixmaps filelist
276 @cp AUTHORS LICENSE $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION) 250 @cp AUTHORS LICENSE $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
277 @cp -r src $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION) 251 @cp -r src $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
278 @cp -r scripts $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION) 252 @cp -r scripts $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
279 -# @cp $(PACKAGE_TARNAME).spec $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION) 253 + @cp $(PACKAGE_TARNAME).spec $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
280 254
281 - @cp debian.changelog $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)  
282 - @cp debian.control $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)  
283 - @cp debian.rules $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION) 255 + @cp debian.* $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
284 @cp makedeb.sh $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION) 256 @cp makedeb.sh $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
285 257
286 @$(MKDIR) $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/ui 258 @$(MKDIR) $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/ui
287 @cp ui/* $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/ui 259 @cp ui/* $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/ui
288 260
289 @$(MKDIR) $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/debian 261 @$(MKDIR) $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/debian
290 -# @cp debian/*.install $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/debian  
291 262
292 @$(MKDIR) $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/po 263 @$(MKDIR) $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/po
293 @cp po/*.po $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/po 264 @cp po/*.po $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/po
pw3270.spec.in
  Diff comments   View file @d5e08b6
@@ -244,7 +244,7 @@ rm -rf $RPM_BUILD_ROOT @@ -244,7 +244,7 @@ rm -rf $RPM_BUILD_ROOT
244 %{_rexxlibdir}/librx3270.so 244 %{_rexxlibdir}/librx3270.so
245 %{_rexxclassdir}/rx3270.cls 245 %{_rexxclassdir}/rx3270.cls
246 %{_libdir}/@PACKAGE_NAME@-plugins/rx3270.so 246 %{_libdir}/@PACKAGE_NAME@-plugins/rx3270.so
247 -%{_datadir}/pw3270/ui/rexx.xml 247 +%{_datadir}/pw3270/ui/80rexx.xml
248 %endif 248 %endif
249 249
250 #---[ Scripts ]------------------------------------------------------------------------------------------------------- 250 #---[ Scripts ]-------------------------------------------------------------------------------------------------------