From f11eb56e8f0bdd87583af5b8bad89f38d03fc407 Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Thu, 9 Dec 2021 16:24:33 -0300 Subject: [PATCH] Fixing build system. --- Makefile.in | 17 +++-------------- branding/Makefile.in | 11 ++++++----- schemas/Makefile.in | 45 +++++++++++++++++++-------------------------- 3 files changed, 28 insertions(+), 45 deletions(-) diff --git a/Makefile.in b/Makefile.in index c9fac1c..af32897 100644 --- a/Makefile.in +++ b/Makefile.in @@ -88,15 +88,6 @@ BINRLS=$(BINDIR)/Release #---[ Rules ]---------------------------------------------------------------------------- -DEPENDS= \ - Makefile \ - src/include/*.h \ - src/include/pw3270/*.h \ - src/objects/toolbar/private.h \ - src/objects/window/private.h \ - src/objects/actions/private.h \ - src/main/private.h - CFLAGS= \ @CFLAGS@ \ -g \ @@ -117,9 +108,8 @@ LDFLAGS= \ #---[ Debug Rules ]---------------------------------------------------------------------- $(OBJDBG)/%.o: \ - %.c \ - $(DEPENDS) - + %.c + @echo $< ... @$(MKDIR) $(@D) @@ -152,8 +142,7 @@ gschemas.compiled: \ #---[ Release Rules ]-------------------------------------------------------------------- $(OBJRLS)/%.o: \ - %.c \ - $(DEPENDS) + %.c @echo $< ... @$(MKDIR) $(dir $@) diff --git a/branding/Makefile.in b/branding/Makefile.in index 9dc3775..235c2d8 100644 --- a/branding/Makefile.in +++ b/branding/Makefile.in @@ -34,9 +34,10 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ datarootdir=@datarootdir@ bindir=@bindir@ +srcdir=@srcdir@ -BASEDIR=@BASEDIR@ -BINDIR=$(BASEDIR)/.bin +BUILDDIR=@BUILDDIR@ +BINDIR=$(BUILDDIR)/.bin MKDIR=@MKDIR_P@ INSTALL=@INSTALL@ @@ -57,7 +58,7 @@ APPSTREAMCLI=@APPSTREAMCLI@ @$(CONVERT) -density 384 -background transparent $< -define icon:auto-resize -colors 256 $@ $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/%.svg: \ - %.svg + $(srcdir)/%.svg @echo $@ ... @$(MKDIR) `dirname $@` @@ -71,7 +72,7 @@ endif @chmod 644 $@ $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/$(PRODUCT_NAME)-logo.svg: \ - $(PRODUCT_NAME).svg + $(srcdir)/$(PRODUCT_NAME).svg @echo $@ ... @$(MKDIR) `dirname $@` @@ -85,7 +86,7 @@ endif @chmod 644 $@ $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/icons/%.svg: \ - %.svg + $(srcdir)/%.svg @echo $@ ... @$(MKDIR) `dirname $@` diff --git a/schemas/Makefile.in b/schemas/Makefile.in index b756171..5f24902 100644 --- a/schemas/Makefile.in +++ b/schemas/Makefile.in @@ -1,27 +1,19 @@ +# SPDX-License-Identifier: LGPL-3.0-or-later # -# Software pw3270, desenvolvido com base nos códigos fontes do WC3270 e X3270 -# (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a -# aplicativos mainframe. Registro no INPI sob o nome G3270. +# Copyright (C) 2008 Banco do Brasil S.A. # -# Copyright (C) <2008> +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as published +# by the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. # -# Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob -# os termos da GPL v.2 - Licença Pública Geral GNU, conforme publicado pela -# Free Software Foundation. +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. # -# Este programa é distribuído na expectativa de ser útil, mas SEM QUALQUER -# GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou de ADEQUAÇÃO -# A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para -# obter mais detalhes. -# -# Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este -# programa; se não, escreva para a Free Software Foundation, Inc., 51 Franklin -# St, Fifth Floor, Boston, MA 02110-1301 USA -# -# Contatos: -# -# perry.werneck@gmail.com (Alexandre Perry de Souza Werneck) -# erico.mendonca@gmail.com (Erico Mascarenhas de Mendonça) +# You should have received a copy of the GNU Lesser General Public License +# along with this program. If not, see . # PRODUCT_NAME=@PRODUCT_NAME@ @@ -31,6 +23,7 @@ PRODUCT_NAME=@PRODUCT_NAME@ prefix=@prefix@ exec_prefix=@exec_prefix@ bindir=@bindir@ +srcdir=@srcdir@ sbindir=@sbindir@ libdir=@libdir@ includedir=@includedir@ @@ -40,8 +33,8 @@ docdir=@docdir@ sysconfdir=@sysconfdir@ schemadir=@gsettingsschemadir@ -BASEDIR=@BASEDIR@ -BINDIR=$(BASEDIR)/.bin +BUILDDIR=@BUILDDIR@ +BINDIR=$(BUILDDIR)/.bin #---[ Tools ]---------------------------------------------------------------------------- @@ -57,18 +50,18 @@ all: @$(MKDIR) $(BINDIR) @$(GLIB_SCHEMA_COMPILER) \ --targetdir=$(BINDIR) \ - $(BASEDIR)/schemas/@OSNAME@ - + ./@OSNAME@ + install: \ all @$(MKDIR) $(DESTDIR)/$(schemadir) @$(INSTALL_DATA) \ - $(BASEDIR)/schemas/@OSNAME@/application.gschema.xml \ + @OSNAME@/application.gschema.xml \ $(DESTDIR)/$(schemadir)/$(PRODUCT_NAME)-application.gschema.xml @$(INSTALL_DATA) \ - $(BASEDIR)/schemas/@OSNAME@/window.gschema.xml \ + @OSNAME@/window.gschema.xml \ $(DESTDIR)/$(schemadir)/$(PRODUCT_NAME)-window.gschema.xml @$(GLIB_SCHEMA_COMPILER) \ -- libgit2 0.21.2