Download as
Browse Code »

Commit f11eb56e8f0bdd87583af5b8bad89f38d03fc407

Authored by Perry Werneck
1 parent f533b813
Exists in master and in 2 other branches develop, script-support

Fixing build system.

Showing 3 changed files with 28 additions and 45 deletions   Show diff stats
Makefile.in
  Diff comments   View file @f11eb56
... ... @@ -88,15 +88,6 @@ BINRLS=$(BINDIR)/Release
88 88  
89 89 #---[ Rules ]----------------------------------------------------------------------------
90 90  
91   -DEPENDS= \
92   - Makefile \
93   - src/include/*.h \
94   - src/include/pw3270/*.h \
95   - src/objects/toolbar/private.h \
96   - src/objects/window/private.h \
97   - src/objects/actions/private.h \
98   - src/main/private.h
99   -
100 91 CFLAGS= \
101 92 @CFLAGS@ \
102 93 -g \
... ... @@ -117,9 +108,8 @@ LDFLAGS= \
117 108 #---[ Debug Rules ]----------------------------------------------------------------------
118 109  
119 110 $(OBJDBG)/%.o: \
120   - %.c \
121   - $(DEPENDS)
122   -
  111 + %.c
  112 +
123 113 @echo $< ...
124 114 @$(MKDIR) $(@D)
125 115  
... ... @@ -152,8 +142,7 @@ gschemas.compiled: \
152 142 #---[ Release Rules ]--------------------------------------------------------------------
153 143  
154 144 $(OBJRLS)/%.o: \
155   - %.c \
156   - $(DEPENDS)
  145 + %.c
157 146  
158 147 @echo $< ...
159 148 @$(MKDIR) $(dir $@)
... ...
branding/Makefile.in
  Diff comments   View file @f11eb56
... ... @@ -34,9 +34,10 @@ prefix=@prefix@
34 34 exec_prefix=@exec_prefix@
35 35 datarootdir=@datarootdir@
36 36 bindir=@bindir@
  37 +srcdir=@srcdir@
37 38  
38   -BASEDIR=@BASEDIR@
39   -BINDIR=$(BASEDIR)/.bin
  39 +BUILDDIR=@BUILDDIR@
  40 +BINDIR=$(BUILDDIR)/.bin
40 41  
41 42 MKDIR=@MKDIR_P@
42 43 INSTALL=@INSTALL@
... ... @@ -57,7 +58,7 @@ APPSTREAMCLI=@APPSTREAMCLI@
57 58 @$(CONVERT) -density 384 -background transparent $< -define icon:auto-resize -colors 256 $@
58 59  
59 60 $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/%.svg: \
60   - %.svg
  61 + $(srcdir)/%.svg
61 62  
62 63 @echo $@ ...
63 64 @$(MKDIR) `dirname $@`
... ... @@ -71,7 +72,7 @@ endif
71 72 @chmod 644 $@
72 73  
73 74 $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/$(PRODUCT_NAME)-logo.svg: \
74   - $(PRODUCT_NAME).svg
  75 + $(srcdir)/$(PRODUCT_NAME).svg
75 76  
76 77 @echo $@ ...
77 78 @$(MKDIR) `dirname $@`
... ... @@ -85,7 +86,7 @@ endif
85 86 @chmod 644 $@
86 87  
87 88 $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/icons/%.svg: \
88   - %.svg
  89 + $(srcdir)/%.svg
89 90  
90 91 @echo $@ ...
91 92 @$(MKDIR) `dirname $@`
... ...
schemas/Makefile.in
  Diff comments   View file @f11eb56
  1 +# SPDX-License-Identifier: LGPL-3.0-or-later
1 2 #
2   -# Software pw3270, desenvolvido com base nos códigos fontes do WC3270 e X3270
3   -# (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a
4   -# aplicativos mainframe. Registro no INPI sob o nome G3270.
  3 +# Copyright (C) 2008 Banco do Brasil S.A.
5 4 #
6   -# Copyright (C) <2008> <Banco do Brasil S.A.>
  5 +# This program is free software: you can redistribute it and/or modify
  6 +# it under the terms of the GNU Lesser General Public License as published
  7 +# by the Free Software Foundation, either version 3 of the License, or
  8 +# (at your option) any later version.
7 9 #
8   -# Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob
9   -# os termos da GPL v.2 - Licença Pública Geral GNU, conforme publicado pela
10   -# Free Software Foundation.
  10 +# This program is distributed in the hope that it will be useful,
  11 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
  12 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  13 +# GNU General Public License for more details.
11 14 #
12   -# Este programa é distribuído na expectativa de ser útil, mas SEM QUALQUER
13   -# GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou de ADEQUAÇÃO
14   -# A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para
15   -# obter mais detalhes.
16   -#
17   -# Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este
18   -# programa; se não, escreva para a Free Software Foundation, Inc., 51 Franklin
19   -# St, Fifth Floor, Boston, MA 02110-1301 USA
20   -#
21   -# Contatos:
22   -#
23   -# perry.werneck@gmail.com (Alexandre Perry de Souza Werneck)
24   -# erico.mendonca@gmail.com (Erico Mascarenhas de Mendonça)
  15 +# You should have received a copy of the GNU Lesser General Public License
  16 +# along with this program. If not, see <https://www.gnu.org/licenses/>.
25 17 #
26 18  
27 19 PRODUCT_NAME=@PRODUCT_NAME@
... ... @@ -31,6 +23,7 @@ PRODUCT_NAME=@PRODUCT_NAME@
31 23 prefix=@prefix@
32 24 exec_prefix=@exec_prefix@
33 25 bindir=@bindir@
  26 +srcdir=@srcdir@
34 27 sbindir=@sbindir@
35 28 libdir=@libdir@
36 29 includedir=@includedir@
... ... @@ -40,8 +33,8 @@ docdir=@docdir@
40 33 sysconfdir=@sysconfdir@
41 34 schemadir=@gsettingsschemadir@
42 35  
43   -BASEDIR=@BASEDIR@
44   -BINDIR=$(BASEDIR)/.bin
  36 +BUILDDIR=@BUILDDIR@
  37 +BINDIR=$(BUILDDIR)/.bin
45 38  
46 39 #---[ Tools ]----------------------------------------------------------------------------
47 40  
... ... @@ -57,18 +50,18 @@ all:
57 50 @$(MKDIR) $(BINDIR)
58 51 @$(GLIB_SCHEMA_COMPILER) \
59 52 --targetdir=$(BINDIR) \
60   - $(BASEDIR)/schemas/@OSNAME@
61   -
  53 + ./@OSNAME@
  54 +
62 55 install: \
63 56 all
64 57  
65 58 @$(MKDIR) $(DESTDIR)/$(schemadir)
66 59 @$(INSTALL_DATA) \
67   - $(BASEDIR)/schemas/@OSNAME@/application.gschema.xml \
  60 + @OSNAME@/application.gschema.xml \
68 61 $(DESTDIR)/$(schemadir)/$(PRODUCT_NAME)-application.gschema.xml
69 62  
70 63 @$(INSTALL_DATA) \
71   - $(BASEDIR)/schemas/@OSNAME@/window.gschema.xml \
  64 + @OSNAME@/window.gschema.xml \
72 65 $(DESTDIR)/$(schemadir)/$(PRODUCT_NAME)-window.gschema.xml
73 66  
74 67 @$(GLIB_SCHEMA_COMPILER) \
... ...