Download as
Browse Code »

Commit 7b6df93107f1653f578c8034df20c469e58c5022

Authored by Perry Werneck
1 parent 3355715b
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Ajustes para empacotamento.

Showing 9 changed files with 166 additions and 20 deletions   Show diff stats
Makefile.in
  Diff comments   View file @7b6df93
... ... @@ -46,6 +46,7 @@ sysconfdir=@sysconfdir@
46 46 mandir=@mandir@
47 47  
48 48 BASEDIR=@BASEDIR@
  49 +SRCDIR=$(BASEDIR)/.src/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
49 50 POTDIR=$(BASEDIR)/.pot
50 51  
51 52 BINDIR=$(BASEDIR)/.bin
... ... @@ -59,6 +60,7 @@ INSTALL_DATA=@INSTALL_DATA@
59 60 INSTALL_PROGRAM=@INSTALL_PROGRAM@
60 61 MKDIR=@MKDIR_P@
61 62 MSGCAT=@MSGCAT@
  63 +AMTAR=@AMTAR@
62 64  
63 65 #---[ Rules ]------------------------------------------------------------------
64 66  
... ... @@ -113,6 +115,25 @@ $(DESTDIR)$(libdir)/%@EXEEXT@: \
113 115  
114 116 @$(MAKE) DESTDIR=$(DESTDIR) -C src/$(basename $(notdir $@)) install
115 117  
  118 +$(SRCDIR)/%: \
  119 + %/Makefile
  120 +
  121 + @make -C `dirname $<` $@
  122 +
  123 +%.tar.bz2: \
  124 + %.tar
  125 +
  126 + @echo $< ...
  127 + @bzip2 --compress -9 --stdout $< > $@
  128 + @chmod 0644 $@
  129 +
  130 +%.tar.gz: \
  131 + %.tar
  132 +
  133 + @echo $< ...
  134 + @gzip -9 --stdout $< > $@
  135 + @chmod 0644 $@
  136 +
116 137  
117 138 #---[ Release targets ]--------------------------------------------------------
118 139  
... ... @@ -160,8 +181,82 @@ run: \
160 181  
161 182 #---[ Package Targets ]--------------------------------------------------------
162 183  
163   -
164   -#---[ Clean Targets ]----------------------------------------------------------
  184 +tgz: \
  185 + $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz
  186 +
  187 +bz2: \
  188 + $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.bz2
  189 +
  190 +tar: \
  191 + $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar
  192 +
  193 +$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar: \
  194 + $(SRCDIR)
  195 +
  196 + @$(AMTAR) \
  197 + --verbose \
  198 + --format=ustar \
  199 + --create \
  200 + --exclude-vcs \
  201 + --directory $(BASEDIR)/.src \
  202 + --owner=root \
  203 + --group=root \
  204 + --file=$@ \
  205 + $(PACKAGE_TARNAME)-@PACKAGE_VERSION@
  206 +
  207 +$(SRCDIR): \
  208 + clean \
  209 + $(SRCDIR)/ui \
  210 + $(SRCDIR)/src/lib3270 \
  211 + $(SRCDIR)/src/pw3270
  212 +
  213 + @$(MKDIR) $(SRCDIR)
  214 + @$(INSTALL_DATA) \
  215 + *.in configure.ac *.cbp LICENCA LICENSE AUTHORS \
  216 + $(SRCDIR)
  217 +
  218 + @$(INSTALL_PROGRAM) \
  219 + autogen.sh \
  220 + $(SRCDIR)
  221 +
  222 + @$(MKDIR) $(SRCDIR)/locale
  223 + @$(INSTALL_DATA) \
  224 + locale/*.po \
  225 + locale/*.in \
  226 + $(SRCDIR)/locale
  227 +
  228 + @$(MKDIR) $(SRCDIR)/conf
  229 + @$(INSTALL_DATA) \
  230 + conf/*.conf \
  231 + $(SRCDIR)/conf
  232 +
  233 + @$(MKDIR) $(SRCDIR)/debian
  234 + @$(INSTALL_DATA) \
  235 + debian/* \
  236 + $(SRCDIR)/debian
  237 +
  238 + @$(INSTALL_DATA) \
  239 + rpm/*.spec \
  240 + $(SRCDIR)
  241 +
  242 + @$(MKDIR) $(SRCDIR)/src/include
  243 + @$(INSTALL_DATA) \
  244 + src/include/*.h \
  245 + $(SRCDIR)/src/include
  246 +
  247 + @$(MKDIR) $(SRCDIR)/src/include/lib3270
  248 + @$(INSTALL_DATA) \
  249 + src/include/lib3270/*.h \
  250 + src/include/lib3270/*.in \
  251 + $(SRCDIR)/src/include/lib3270
  252 +
  253 + @$(MKDIR) $(SRCDIR)/src/include/pw3270
  254 + @$(INSTALL_DATA) \
  255 + src/include/pw3270/*.h \
  256 + $(SRCDIR)/src/include/pw3270
  257 +
  258 +
  259 +#---[ Clean Targets ]----------------------------------------------------------$(
165 260  
166 261 cleanDebug:
167 262  
... ... @@ -182,6 +277,7 @@ clean: \
182 277  
183 278 @rm -fr $(BINDIR)
184 279 @rm -fr $(POTDIR)
  280 + @rm -fr $(SRCDIR)
185 281  
186 282  
187 283  
... ...
locale/pw3270.pot
  Diff comments   View file @7b6df93
... ... @@ -9,7 +9,7 @@ msgstr &quot;&quot;
9 9 "#-#-#-#-# lib3270.pot (PACKAGE VERSION) #-#-#-#-#\n"
10 10 "Project-Id-Version: PACKAGE VERSION\n"
11 11 "Report-Msgid-Bugs-To: \n"
12   -"POT-Creation-Date: 2017-01-18 15:27-0200\n"
  12 +"POT-Creation-Date: 2017-01-18 16:20-0200\n"
13 13 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
14 14 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
15 15 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -20,7 +20,7 @@ msgstr &quot;&quot;
20 20 "#-#-#-#-# pw3270.pot (PACKAGE VERSION) #-#-#-#-#\n"
21 21 "Project-Id-Version: PACKAGE VERSION\n"
22 22 "Report-Msgid-Bugs-To: \n"
23   -"POT-Creation-Date: 2017-01-18 15:27-0200\n"
  23 +"POT-Creation-Date: 2017-01-18 16:20-0200\n"
24 24 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
25 25 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
26 26 "Language-Team: LANGUAGE <LL@li.org>\n"
... ...
src/lib3270/Makefile.in
  Diff comments   View file @7b6df93
... ... @@ -47,7 +47,7 @@ sbindir=@sbindir@
47 47 libdir=@libdir@
48 48  
49 49 BASEDIR=@BASEDIR@
50   -
  50 +SRCDIR=$(BASEDIR)/.src/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/src/lib3270
51 51 POTDIR=$(BASEDIR)/.pot/lib3270
52 52  
53 53 OBJDIR=$(BASEDIR)/.obj/lib3270
... ... @@ -235,6 +235,13 @@ else
235 235 @cd "$(ROOTDIR)" ; \$(VALGRIND) --leak-check=full --gen-suppressions=all $(BINDBG)/testprogram$(EXEEXT)
236 236 endif
237 237  
  238 +$(SRCDIR): \
  239 + clean
  240 +
  241 + @$(MKDIR) $@
  242 + @$(INSTALL_DATA) *.c *.h *.in *.cbp *.xad *.sh $@
  243 +
  244 +
238 245 #---[ Clean Targets]---------------------------------------------------------------------
239 246  
240 247 cleanDebug:
... ...
src/pw3270/Makefile.in
  Diff comments   View file @7b6df93
... ... @@ -48,7 +48,7 @@ localedir=@localedir@
48 48 desktopdir=$(datarootdir)/applications
49 49  
50 50 BASEDIR=@BASEDIR@
51   -
  51 +SRCDIR=$(BASEDIR)/.src/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/src/pw3270
52 52 POTDIR=$(BASEDIR)/.pot/$(PACKAGE_TARNAME)
53 53  
54 54 OBJDIR=.obj
... ... @@ -136,6 +136,11 @@ $(POTDIR)/%.pot: \
136 136  
137 137 @$(MAKE) -C $(basename $(notdir $@)) $@
138 138  
  139 +$(SRCDIR)/%: \
  140 + %/Makefile
  141 +
  142 + @make -C `dirname $<` $@
  143 +
139 144 #---[ Release Targets ]------------------------------------------------------------------
140 145  
141 146 all: \
... ... @@ -206,6 +211,14 @@ install: \
206 211 $(BINRLS)/$(PACKAGE_TARNAME)$(EXEEXT) \
207 212 $(DESTDIR)$(bindir)
208 213  
  214 +$(SRCDIR): \
  215 + clean \
  216 + $(foreach MOD, $(MODULES), $(SRCDIR)/$(MOD))
  217 +
  218 +
  219 + @$(MKDIR) $@
  220 + @$(INSTALL_DATA) *.c *.h *.in *.cbp $@
  221 +
209 222 #---[ Debug Targets ]--------------------------------------------------------------------
210 223  
211 224 Debug: \
... ...
src/pw3270/common/Makefile.in
  Diff comments   View file @7b6df93
... ... @@ -41,6 +41,7 @@ sbindir=@sbindir@
41 41 libdir=@libdir@
42 42  
43 43 BASEDIR=@BASEDIR@
  44 +SRCDIR=$(BASEDIR)/.src/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/src/pw3270/$(MODULE_NAME)
44 45 POTDIR=$(BASEDIR)/.pot/$(PACKAGE_TARNAME)/$(MODULE_NAME)
45 46  
46 47 OBJDIR=.obj
... ... @@ -53,6 +54,8 @@ LD=@CC@
53 54 AR=@AR@
54 55 XGETTEXT=@XGETTEXT@
55 56 MSGCAT=@MSGCAT@
  57 +INSTALL=@INSTALL@
  58 +INSTALL_DATA=@INSTALL_DATA@
56 59  
57 60 CFLAGS=@CFLAGS@ @LIB3270_CFLAGS@ -Wno-deprecated-declarations @GTK_CFLAGS@ -I$(BASEDIR)/src/include/pw3270
58 61 LIBS=@LIBS@ @GTK_LIBS@ @LIB3270_LIBS@
... ... @@ -120,6 +123,12 @@ $(BASEDIR)/.pot/$(PACKAGE_TARNAME)/$(MODULE_NAME).pot: \
120 123 @mkdir -p `dirname $@`
121 124 @$(MSGCAT) --sort-output $^ > $@
122 125  
  126 +$(SRCDIR): \
  127 + clean
  128 +
  129 + @$(MKDIR) $@
  130 + @$(INSTALL_DATA) *.c *.h *.in $@
  131 +
123 132 #---[ Debug Targets ]--------------------------------------------------------------------
124 133  
125 134 Debug: \
... ...
src/pw3270/uiparser/Makefile.in
  Diff comments   View file @7b6df93
... ... @@ -43,6 +43,7 @@ sbindir=@sbindir@
43 43 libdir=@libdir@
44 44  
45 45 BASEDIR=@BASEDIR@
  46 +SRCDIR=$(BASEDIR)/.src/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/src/pw3270/$(MODULE_NAME)
46 47 POTDIR=$(BASEDIR)/.pot/$(PACKAGE_TARNAME)/$(MODULE_NAME)
47 48  
48 49 OBJDIR=.obj
... ... @@ -55,6 +56,8 @@ LD=@CC@
55 56 AR=@AR@
56 57 XGETTEXT=@XGETTEXT@
57 58 MSGCAT=@MSGCAT@
  59 +INSTALL=@INSTALL@
  60 +INSTALL_DATA=@INSTALL_DATA@
58 61  
59 62 CFLAGS=@CFLAGS@ @LIB3270_CFLAGS@ -Wno-deprecated-declarations @GTK_CFLAGS@ -I$(BASEDIR)/src/include/pw3270
60 63 LIBS=@LIBS@ @GTK_LIBS@ @LIB3270_LIBS@
... ... @@ -100,20 +103,6 @@ $(POTDIR)/%.pot: %.c
100 103  
101 104 @touch $@
102 105  
103   -marshal.h: \
104   - genmarshal
105   -
106   - @echo $< ...
107   - @$(MKDIR) `dirname $@`
108   - @glib-genmarshal --prefix=v3270 --header genmarshal > $@
109   -
110   -marshal.c: \
111   - marshal.h
112   -
113   - @echo $< ...
114   - @$(MKDIR) `dirname $@`
115   - @glib-genmarshal --prefix=v3270 --body genmarshal > $@
116   -
117 106 #---[ Release Targets ]------------------------------------------------------------------
118 107  
119 108 Release: \
... ... @@ -136,6 +125,12 @@ $(BASEDIR)/.pot/$(PACKAGE_TARNAME)/$(MODULE_NAME).pot: \
136 125 @mkdir -p `dirname $@`
137 126 @$(MSGCAT) --sort-output $^ > $@
138 127  
  128 +$(SRCDIR): \
  129 + clean
  130 +
  131 + @$(MKDIR) $@
  132 + @$(INSTALL_DATA) *.c *.h *.in *.cbp $@
  133 +
139 134 #---[ Debug Targets ]--------------------------------------------------------------------
140 135  
141 136 Debug: \
... ...
src/pw3270/v3270/Makefile.in
  Diff comments   View file @7b6df93
... ... @@ -42,6 +42,7 @@ sbindir=@sbindir@
42 42 libdir=@libdir@
43 43  
44 44 BASEDIR=@BASEDIR@
  45 +SRCDIR=$(BASEDIR)/.src/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/src/pw3270/$(MODULE_NAME)
45 46 POTDIR=$(BASEDIR)/.pot/$(PACKAGE_TARNAME)/$(MODULE_NAME)
46 47  
47 48 OBJDIR=.obj
... ... @@ -55,6 +56,8 @@ AR=@AR@
55 56 GENMARSHAL=@GENMARSHAL@
56 57 XGETTEXT=@XGETTEXT@
57 58 MSGCAT=@MSGCAT@
  59 +INSTALL=@INSTALL@
  60 +INSTALL_DATA=@INSTALL_DATA@
58 61  
59 62 CFLAGS=@CFLAGS@ @LIB3270_CFLAGS@ -Wno-deprecated-declarations @GTK_CFLAGS@ -I$(BASEDIR)/src/include/pw3270
60 63 LIBS=@LIBS@ @GTK_LIBS@ @LIB3270_LIBS@
... ... @@ -136,6 +139,13 @@ $(BASEDIR)/.pot/$(PACKAGE_TARNAME)/$(MODULE_NAME).pot: \
136 139 @mkdir -p `dirname $@`
137 140 @$(MSGCAT) --sort-output $^ > $@
138 141  
  142 +$(SRCDIR): \
  143 + clean
  144 +
  145 + @$(MKDIR) $@
  146 + @$(INSTALL_DATA) *.c *.h *.in *.xbm *.cbp genmarshal $@
  147 +
  148 +
139 149 #---[ Debug Targets ]--------------------------------------------------------------------
140 150  
141 151 Debug: \
... ...
src/pw3270/v3270ft/Makefile.in
  Diff comments   View file @7b6df93
... ... @@ -42,6 +42,7 @@ sbindir=@sbindir@
42 42 libdir=@libdir@
43 43  
44 44 BASEDIR=@BASEDIR@
  45 +SRCDIR=$(BASEDIR)/.src/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/src/pw3270/$(MODULE_NAME)
45 46 POTDIR=$(BASEDIR)/.pot/$(PACKAGE_TARNAME)/$(MODULE_NAME)
46 47  
47 48 OBJDIR=.obj
... ... @@ -55,6 +56,8 @@ AR=@AR@
55 56 GENMARSHAL=@GENMARSHAL@
56 57 XGETTEXT=@XGETTEXT@
57 58 MSGCAT=@MSGCAT@
  59 +INSTALL=@INSTALL@
  60 +INSTALL_DATA=@INSTALL_DATA@
58 61  
59 62 CFLAGS=@CFLAGS@ @LIB3270_CFLAGS@ -Wno-deprecated-declarations @GTK_CFLAGS@ -I$(BASEDIR)/src/include/pw3270
60 63 LIBS=@LIBS@ @GTK_LIBS@ @LIB3270_LIBS@
... ... @@ -136,6 +139,12 @@ $(BASEDIR)/.pot/$(PACKAGE_TARNAME)/$(MODULE_NAME).pot: \
136 139 @mkdir -p `dirname $@`
137 140 @$(MSGCAT) --sort-output $^ > $@
138 141  
  142 +$(SRCDIR): \
  143 + clean
  144 +
  145 + @$(MKDIR) $@
  146 + @$(INSTALL_DATA) *.c *.h *.in *.cbp genmarshal $@
  147 +
139 148 #---[ Debug Targets ]--------------------------------------------------------------------
140 149  
141 150 Debug: \
... ...
ui/Makefile.in
  Diff comments   View file @7b6df93
... ... @@ -39,6 +39,7 @@ PACKAGE_TARNAME=@PACKAGE_TARNAME@
39 39  
40 40 BASEDIR=@BASEDIR@
41 41 POTDIR=$(BASEDIR)/.pot/ui
  42 +SRCDIR=$(BASEDIR)/.src/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/ui
42 43  
43 44 OBJDIR=.obj
44 45 OBJDBG=$(OBJDIR)/Debug
... ... @@ -105,6 +106,12 @@ install:
105 106 @$(MKDIR) $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)/ui
106 107 @$(INSTALL_DATA) *.xml $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)/ui
107 108  
  109 +$(SRCDIR): \
  110 + clean
  111 +
  112 + @$(MKDIR) $@
  113 + @$(INSTALL_DATA) *.xml *.in *.c $@
  114 +
108 115 pot: \
109 116 $(BASEDIR)/.pot/ui.pot
110 117  
... ...