Download as
Browse Code »

Commit da5cfa149188d2de098d6938cd0299e121221afd

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

Ajustes para empacotamento .deb

Showing 4 changed files with 43 additions and 14 deletions   Show diff stats
Makefile.in
  Diff comments   View file @da5cfa1
... ... @@ -70,24 +70,39 @@ ifneq ($(CONVERT),no)
70 70 @$(CONVERT) $< --format=png > $@
71 71 endif
72 72  
  73 +debian/%.install: src/%/Makefile
  74 + @$(MAKE) DEBDIR=../../debian -C $(dir $^) ../../$@
  75 +
73 76 #---[ Release targets ]--------------------------------------------------------
74 77  
75   -all: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT)
  78 +all: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) filelist
76 79  
77   -Release: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT)
  80 +Release: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT)
78 81  
79   -$(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT): src/gtk/* $(BINDIR)/Release/lib/@DLLPREFIX@3270@DLLEXT@ $(DEPENDS)
80   - @$(MAKE) BINDIR="../../$(BINDIR)" LIB3270_LIBS="$(RLSLIB)" LIB3270_CFLAGS="-I../../src/include" -C src/gtk ../../$(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT)
  82 +$(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT): src/pw3270/* $(BINDIR)/Release/lib/@DLLPREFIX@3270@DLLEXT@ $(DEPENDS)
  83 + @$(MAKE) BINDIR="../../$(BINDIR)" LIB3270_LIBS="$(RLSLIB)" LIB3270_CFLAGS="-I../../src/include" -C src/pw3270 ../../$(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT)
81 84  
82 85 $(BINDIR)/Release/lib/@DLLPREFIX@3270@DLLEXT@: src/lib3270/* src/include/lib3270/* src/include/* Makefile
83 86 @$(MAKE) BINRLS=../../.bin/Release/lib -C src/lib3270 ../../.bin/Release/lib/@DLLPREFIX@3270@DLLEXT@
84 87  
  88 +#---[ File lists ]-------------------------------------------------------------
  89 +
  90 +filelist: debian/lib3270.install debian/lib3270-dev.install debian/pw3270.install
  91 +
  92 +debian/lib3270-dev.install: Makefile
  93 + @echo " GEN `basename $@`"
  94 + @$(MKDIR) `dirname $@`
  95 + @echo "$(includedir)/lib3270.h" > $@
  96 + @echo "$(includedir)/lib3270" >> $@
  97 + @echo "$(datarootdir)/@PACKAGE_NAME@/ui/99debug.xml" >> $@
  98 + @echo "$(libdir)/pkgconfig/*.pc" >: $@
  99 +
85 100 #---[ Debug targets ]----------------------------------------------------------
86 101  
87 102 Debug: $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT)
88 103  
89   -$(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT): src/gtk/* $(BINDIR)/Debug/lib/@DLLPREFIX@3270@DLLEXT@ $(DEPENDS)
90   - @$(MAKE) BINDIR="../../$(BINDIR)" LIB3270_LIBS="$(DBGLIB)" LIB3270_CFLAGS="-I../../src/include" -C src/gtk ../../$(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT)
  104 +$(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT): src/pw3270/* $(BINDIR)/Debug/lib/@DLLPREFIX@3270@DLLEXT@ $(DEPENDS)
  105 + @$(MAKE) BINDIR="../../$(BINDIR)" LIB3270_LIBS="$(DBGLIB)" LIB3270_CFLAGS="-I../../src/include" -C src/pw3270 ../../$(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT)
91 106  
92 107 $(BINDIR)/Debug/lib/@DLLPREFIX@3270@DLLEXT@: src/lib3270/* src/include/lib3270/* src/include/* Makefile
93 108 @$(MAKE) BINDBG=../../.bin/Debug/lib -C src/lib3270 ../../.bin/Debug/lib/@DLLPREFIX@3270@DLLEXT@
... ... @@ -99,7 +114,7 @@ memchk: $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT)
99 114 ifeq ($(VALGRIND),no)
100 115 @PATH="$(BINDIR)/Debug/lib:$(PATH)" "$(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT)"
101 116 else
102   - @PATH="$(BINDIR)/Debug/lib:$(PATH)" G_DEBUG=gc-friendly G_SLICE=always-malloc \$(VALGRIND) --leak-check=full --suppressions=src/gtk/valgrind.suppression --gen-suppressions=all $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT)
  117 + @PATH="$(BINDIR)/Debug/lib:$(PATH)" G_DEBUG=gc-friendly G_SLICE=always-malloc \$(VALGRIND) --leak-check=full --suppressions=src/pw3270/valgrind.suppression --gen-suppressions=all $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT)
103 118 endif
104 119  
105 120 #---[ Targets ]----------------------------------------------------------------
... ... @@ -140,7 +155,7 @@ $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz: clean $(PACKAGE_NAME).png $(PACKAG
140 155 @echo $@
141 156  
142 157 install: install-sdk install-lib $(PACKAGE_NAME).png $(PACKAGE_NAME)-logo.png
143   - @make BINDIR="../../$(BINDIR)" LIB3270_LIBS="$(RLSLIB)" LIB3270_CFLAGS="-I../../src/include" -C src/gtk install
  158 + @make BINDIR="../../$(BINDIR)" LIB3270_LIBS="$(RLSLIB)" LIB3270_CFLAGS="-I../../src/include" -C src/pw3270 install
144 159  
145 160 @$(MKDIR) $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)/ui
146 161 @$(INSTALL_DATA) ui/*.xml $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)/ui
... ... @@ -163,17 +178,18 @@ clean:
163 178 @rm -fr .obj
164 179 @rm -fr .bin
165 180 @rm -fr .tmp
  181 + @rm -f debian/*.install
166 182 @make -C src/lib3270 clean
167   - @make -C src/gtk clean
  183 + @make -C src/pw3270 clean
168 184 @rm -f *.log
169 185  
170 186 distclean: clean
171   - @rm -f src/gtk/Makefile
  187 + @rm -f src/pw3270/Makefile
172 188 @rm -f config.status
173 189 @rm -f src/lib3270/mkversion.sh
174 190 @rm -f src/lib3270/Makefile
175 191 @rm -f src/include/lib3270/config.h
176   - @rm -f src/gtk/uiparser/Makefile
  192 + @rm -f src/pw3270/uiparser/Makefile
177 193 @rm -fr autom4te.cache
178 194 @rm -f *.pc
179 195  
... ...
configure.ac
  Diff comments   View file @da5cfa1
... ... @@ -269,9 +269,9 @@ AC_CONFIG_FILES([
269 269 src/include/rules.mak
270 270 src/lib3270/Makefile
271 271 src/lib3270/mkversion.sh
272   - src/gtk/Makefile
273   - src/gtk/uiparser/Makefile
274   - src/gtk/common/common.h
  272 + src/pw3270/Makefile
  273 + src/pw3270/uiparser/Makefile
  274 + src/pw3270/common/common.h
275 275  
276 276 ])
277 277  
... ...
src/lib3270/Makefile.in
  Diff comments   View file @da5cfa1
... ... @@ -123,6 +123,10 @@ $(BINDBG)/testprogram$(EXEEXT): $(OBJDBG)/testprogram.o $(foreach SRC, $(basenam
123 123 @$(MKDIR) `dirname $@`
124 124 $(LD) -o $@ $^ $(LIBS)
125 125  
  126 +$(DEBDIR)/lib3270.install: Makefile
  127 + @echo " GEN `basename $@`"
  128 + @$(MKDIR) `dirname $@`
  129 + @echo "$(libdir)/lib3270.so" > $@
126 130  
127 131 run: $(BINDBG)/testprogram$(EXEEXT)
128 132 $(BINDBG)/testprogram$(EXEEXT)
... ...
src/pw3270/Makefile.in
  Diff comments   View file @da5cfa1
... ... @@ -35,6 +35,7 @@ exec_prefix=@exec_prefix@
35 35 bindir=@bindir@
36 36 datarootdir=@datarootdir@
37 37 localedir=@localedir@
  38 +DEBDIR ?= debian
38 39  
39 40 EXEEXT=@EXEEXT@
40 41 STRIP=@STRIP@
... ... @@ -101,6 +102,14 @@ endif
101 102  
102 103 #---[ Misc targets ]-----------------------------------------------------------
103 104  
  105 +$(DEBDIR)/pw3270.install: Makefile
  106 + @echo " GEN `basename $@`"
  107 + @$(MKDIR) `dirname $@`
  108 + @echo "$(bindir)/@PACKAGE_NAME@" >> $@
  109 + @echo "$(datarootdir)/@PACKAGE_NAME@/ui/00default.xml" >> $@
  110 + @echo "$(datarootdir)/@PACKAGE_NAME@/@PACKAGE_NAME@.png" >> $@
  111 + @echo "$(datarootdir)/@PACKAGE_NAME@/@PACKAGE_NAME@-logo.png" >> $@
  112 +
104 113 v3270/marshal.h: v3270/genmarshal
105 114 @$(MKDIR) `dirname $@`
106 115 @glib-genmarshal --prefix=$(PACKAGE_NAME) --header v3270/genmarshal > $@
... ...