From a071d4fc3f2c845d36508ba9abf8a4752a61ba42 Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Mon, 16 Dec 2019 15:20:44 -0300 Subject: [PATCH] Adding "install" targets. --- Makefile.in | 20 ++++++++++++++++---- configure.ac | 9 ++++++--- schemas/Makefile.in | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 82 insertions(+), 7 deletions(-) create mode 100644 schemas/Makefile.in diff --git a/Makefile.in b/Makefile.in index b4e45d4..c2765f0 100644 --- a/Makefile.in +++ b/Makefile.in @@ -184,6 +184,11 @@ $(POTDIR)/$(PACKAGE_NAME)/%.pot: \ @touch $@ +install-%: \ + %/Makefile + + @$(MAKE) -C `dirname $<` DESTDIR=$(DESTDIR) install + #---[ Release Targets ]------------------------------------------------------------------ all: \ @@ -211,6 +216,17 @@ $(BINRLS)/$(PACKAGE_NAME)@EXEEXT@: \ install: \ $(foreach PKG, $(INSTALL_PACKAGES), install-$(PKG)) +install-application: \ + $(BINRLS)/$(PACKAGE_NAME)@EXEEXT@ + + @$(MKDIR) \ + $(DESTDIR)/$(bindir) + + @$(INSTALL_PROGRAM) \ + $(BINRLS)/$(PACKAGE_NAME)@EXEEXT@ \ + $(DESTDIR)/$(bindir)/$(PRODUCT_NAME)@EXEEXT@ + +install-lang: #---[ Misc Targets ]--------------------------------------------------------------------- @@ -221,10 +237,6 @@ $(POTDIR)/$(PACKAGE_NAME).pot: \ @$(MKDIR) $(@D) @$(MSGCAT) --sort-output $^ > $@ -locale: \ - $(POTDIR)/$(PACKAGE_NAME).pot - - #---[ Debug Targets ]-------------------------------------------------------------------- Debug: \ diff --git a/configure.ac b/configure.ac index 5beed63..f3b3a8a 100644 --- a/configure.ac +++ b/configure.ac @@ -60,7 +60,7 @@ dnl --------------------------------------------------------------------------- dnl Check for OS specifics dnl --------------------------------------------------------------------------- -INSTALL_PACKAGES="" +INSTALL_PACKAGES="application locale schemas" case "$host" in *-mingw32|*-pc-msys) @@ -70,7 +70,7 @@ case "$host" in LDFLAGS="$LDFLAGS -pthread" LIBS="$LIBS -lws2_32 -lwtsapi32 -lcomdlg32" - INSTALL_PACKAGES="windows-lib ${INSTALL_PACKAGES}" +dnl INSTALL_PACKAGES="windows-lib ${INSTALL_PACKAGES}" app_win32_revision=$(date +%-y.%-m.%-d.%-H) AC_SUBST(WIN32_VERSION,$app_win32_revision) @@ -89,7 +89,7 @@ case "$host" in CFLAGS="$CFLAGS -pthread" LDFLAGS="$LDFLAGS -pthread" - INSTALL_PACKAGES="linux-lib ${INSTALL_PACKAGES}" +dnl INSTALL_PACKAGES="linux-lib ${INSTALL_PACKAGES}" app_cv_static='no' AC_CONFIG_FILES(schemas/linux/application.gschema.xml) @@ -162,6 +162,8 @@ dnl --------------------------------------------------------------------------- dnl Check for GTK dnl --------------------------------------------------------------------------- +GLIB_GSETTINGS + PKG_CHECK_MODULES( [GTK], [gtk+-3.0 glib-2.0 gmodule-2.0], AC_DEFINE(HAVE_GTK), AC_MSG_ERROR([GTK not present.])) AC_SUBST(GTK_LIBS) @@ -198,6 +200,7 @@ dnl --------------------------------------------------------------------------- AC_SUBST(INSTALL_PACKAGES) AC_CONFIG_FILES(Makefile) +AC_CONFIG_FILES(schemas/Makefile) dnl --------------------------------------------------------------------------- dnl Output the generated config.status script. diff --git a/schemas/Makefile.in b/schemas/Makefile.in new file mode 100644 index 0000000..000fdfe --- /dev/null +++ b/schemas/Makefile.in @@ -0,0 +1,60 @@ +# +# 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> +# +# 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. +# +# 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) +# + +PRODUCT_NAME=@PRODUCT_NAME@ + +#---[ Paths ]---------------------------------------------------------------------------- + +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libdir=@libdir@ +includedir=@includedir@ +datarootdir=@datarootdir@ +localedir=@localedir@ +docdir=@docdir@ +sysconfdir=@sysconfdir@ +schemadir=@gsettingsschemadir@ + +BASEDIR=@BASEDIR@ + +#---[ Tools ]---------------------------------------------------------------------------- + +MKDIR=@MKDIR_P@ +INSTALL=@INSTALL@ +INSTALL_DATA=@INSTALL_DATA@ + +#---[ Install Targets ]------------------------------------------------------------------ + +install: + + @$(MKDIR) $(DESTDIR)/$(schemadir) + @$(INSTALL_DATA) \ + $(BASEDIR)/schemas/@OSNAME@/application.gschema.xml \ + $(DESTDIR)/$(schemadir)/$(PRODUCT_NAME).gschema.xml + + -- libgit2 0.21.2