From ee65b52840e4c7153c69bff2b1eba893c2bfa5e1 Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Thu, 9 Dec 2021 10:03:30 -0300 Subject: [PATCH] Updating build methods. --- .gitignore | 1 + Makefile.in | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------- autogen.sh | 12 ++++++++---- configure.ac | 2 +- src/dialogs/colorscheme.c | 2 +- src/dialogs/settings/url.c | 2 +- src/dialogs/settings/widget.c | 2 +- src/filetransfer/activitylist.c | 2 +- src/filetransfer/settings.c | 2 +- src/filetransfer/v3270ftprogress.c | 2 +- src/filetransfer/worker.c | 2 +- src/terminal/widget.c | 2 +- src/trace/trace.c | 2 +- 13 files changed, 77 insertions(+), 72 deletions(-) diff --git a/.gitignore b/.gitignore index 69b1d80..7d67ea7 100644 --- a/.gitignore +++ b/.gitignore @@ -61,3 +61,4 @@ po *.sh *.conf *.pdf +marshal diff --git a/Makefile.in b/Makefile.in index 3bc04a1..99e318a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -24,6 +24,20 @@ # erico.mendonca@gmail.com (Erico Mascarenhas de Mendonça) # +#---[ Paths ]---------------------------------------------------------------------------- + +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +srcdir=@srcdir@ +sbindir=@sbindir@ +libdir=@libdir@ +includedir=@includedir@ +datarootdir=@datarootdir@ +localedir=@localedir@ +docdir=@docdir@ +sysconfdir=@sysconfdir@ + #---[ Library configuration ]------------------------------------------------------------ SONAME=@SONAME@ @@ -33,28 +47,28 @@ INSTALL_PACKAGES=@INSTALL_PACKAGES@ GETTEXT_PACKAGE=@GETTEXT_PACKAGE@ SOURCES= \ - $(wildcard src/terminal/*.c) \ - $(wildcard src/terminal/@OSNAME@/*.rc) \ - $(wildcard src/terminal/@OSNAME@/*.c) \ - $(wildcard src/terminal/properties/*.c) \ - $(wildcard src/terminal/drawing/*.c) \ - $(wildcard src/terminal/font/*.c) \ - $(wildcard src/terminal/keyboard/*.c) \ - $(wildcard src/terminal/actions/*.c) \ - $(wildcard src/filetransfer/*.c) \ - $(wildcard src/selection/*.c) \ - $(wildcard src/selection/@OSNAME@/*.c) \ - $(wildcard src/trace/*.c) \ - $(wildcard src/dialogs/*.c) \ - $(wildcard src/dialogs/@OSNAME@/*.c) \ - $(wildcard src/dialogs/print/*.c) \ - $(wildcard src/dialogs/save/*.c) \ - $(wildcard src/dialogs/font/*.c) \ - $(wildcard src/dialogs/settings/*.c) \ - $(wildcard src/tools/*.c) + $(wildcard $(srcdir)/src/terminal/*.c) \ + $(wildcard $(srcdir)/src/terminal/@OSNAME@/*.rc) \ + $(wildcard $(srcdir)/src/terminal/@OSNAME@/*.c) \ + $(wildcard $(srcdir)/src/terminal/properties/*.c) \ + $(wildcard $(srcdir)/src/terminal/drawing/*.c) \ + $(wildcard $(srcdir)/src/terminal/font/*.c) \ + $(wildcard $(srcdir)/src/terminal/keyboard/*.c) \ + $(wildcard $(srcdir)/src/terminal/actions/*.c) \ + $(wildcard $(srcdir)/src/filetransfer/*.c) \ + $(wildcard $(srcdir)/src/selection/*.c) \ + $(wildcard $(srcdir)/src/selection/@OSNAME@/*.c) \ + $(wildcard $(srcdir)/src/trace/*.c) \ + $(wildcard $(srcdir)/src/dialogs/*.c) \ + $(wildcard $(srcdir)/src/dialogs/@OSNAME@/*.c) \ + $(wildcard $(srcdir)/src/dialogs/print/*.c) \ + $(wildcard $(srcdir)/src/dialogs/save/*.c) \ + $(wildcard $(srcdir)/src/dialogs/font/*.c) \ + $(wildcard $(srcdir)/src/dialogs/settings/*.c) \ + $(wildcard $(srcdir)/src/tools/*.c) TEST_SOURCES= \ - $(wildcard src/testprogram/*.c) + $(wildcard $(srcdir)/src/testprogram/*.c) #---[ Tools ]---------------------------------------------------------------------------- @@ -76,42 +90,28 @@ ZIP=@ZIP@ DLLTOOL=@DLLTOOL@ STRIP=@STRIP@ -#---[ Paths ]---------------------------------------------------------------------------- +#---[ Build Paths ]---------------------------------------------------------------------- -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libdir=@libdir@ -includedir=@includedir@ -datarootdir=@datarootdir@ -localedir=@localedir@ -docdir=@docdir@ -sysconfdir=@sysconfdir@ - -BASEDIR=@BASEDIR@ +BUILDDIR=@BUILDDIR@ -POTDIR=$(BASEDIR)/.pot +POTDIR=$(BUILDDIR)/.pot -OBJDIR=$(BASEDIR)/.obj/$(LIBNAME) +OBJDIR=$(BUILDDIR)/.obj/$(LIBNAME) OBJDBG=$(OBJDIR)/Debug OBJRLS=$(OBJDIR)/Release -BINDIR=$(BASEDIR)/.bin +BINDIR=$(BUILDDIR)/.bin BINDBG=$(BINDIR)/Debug BINRLS=$(BINDIR)/Release #---[ Rules ]---------------------------------------------------------------------------- DEPENDS= \ - Makefile \ - src/include/*.h \ - src/include/v3270/*.h \ - src/filetransfer/marshal.h \ - src/filetransfer/private.h \ - src/terminal/marshal.h \ - src/trace/marshal.h \ - src/dialogs/settings/marshal.h + src/include/config.h \ + src/include/marshal/filetransfer.h \ + src/include/marshal/terminal.h \ + src/include/marshal/trace.h \ + src/include/marshal/dialogs.h DATE_FMT = +%Y%m%d ifdef SOURCE_DATE_EPOCH @@ -123,6 +123,7 @@ CFLAGS= \ @CFLAGS@ \ -g \ -Isrc/include \ + -I$(srcdir)/src/include \ -DBUILD_DATE=$(BUILD_DATE) \ -DLOCALEDIR=$(localedir) \ @LIB3270_CFLAGS@ \ @@ -233,16 +234,16 @@ install-%: \ #---[ Marshal Targets ]------------------------------------------------------------------ -src/terminal/marshal.h: \ - src/terminal/marshal +src/include/marshal/terminal.h: \ + $(srcdir)/src/terminal/marshal @echo $@ ... @$(MKDIR) $(@D) @$(GENMARSHAL) --prefix=v3270 --header $< > $@ -src/dialogs/settings/marshal.h: \ - src/dialogs/settings/marshal +src/include/marshal/dialogs.h: \ + $(srcdir)/src/dialogs/settings/marshal @echo $@ ... @$(MKDIR) $(@D) @@ -250,7 +251,7 @@ src/dialogs/settings/marshal.h: \ @$(GENMARSHAL) --prefix=v3270 --header $< > $@ $(OBJDIR)/marshal/v3270.c: \ - src/terminal/marshal + $(srcdir)/src/terminal/marshal @echo $@ ... @$(MKDIR) $(@D) @@ -258,8 +259,8 @@ $(OBJDIR)/marshal/v3270.c: \ @$(GENMARSHAL) --prefix=v3270 --body $< > $@ -src/filetransfer/marshal.h: \ - src/filetransfer/marshal +src/include/marshal/filetransfer.h: \ + $(srcdir)/src/filetransfer/marshal @echo $@ ... @$(MKDIR) $(@D) @@ -267,15 +268,15 @@ src/filetransfer/marshal.h: \ @$(GENMARSHAL) --prefix=v3270ft --header $< > $@ $(OBJDIR)/marshal/v3270ft.c: \ - src/filetransfer/marshal + $(srcdir)/src/filetransfer/marshal @echo $@ ... @$(MKDIR) $(@D) @$(GENMARSHAL) --prefix=v3270ft --body $< > $@ -src/trace/marshal.h: \ - src/trace/marshal +src/include/marshal/trace.h: \ + $(srcdir)/src/trace/marshal @echo $@ ... @$(MKDIR) $(@D) @@ -283,14 +284,13 @@ src/trace/marshal.h: \ @$(GENMARSHAL) --prefix=v3270trace --header $< > $@ $(OBJDIR)/marshal/trace.c: \ - src/trace/marshal + $(srcdir)/src/trace/marshal @echo $@ ... @$(MKDIR) $(@D) @$(GENMARSHAL) --prefix=v3270trace --body $< > $@ - $(OBJDIR)/marshal/%.o: \ $(OBJDIR)/marshal/%.c \ $(DEPENDS) @@ -389,7 +389,7 @@ install-windows-lib: \ zip: \ $(BINRLS)/$(SONAME) - @$(ZIP) -9 -j $(BASEDIR)/@PACKAGE_NAME@-@PACKAGE_VERSION@-@PACKAGE_RELEASE@-@host_cpu@.zip $(BINRLS)/$(SONAME) + @$(ZIP) -9 -j $(BUILDDIR)/@PACKAGE_NAME@-@PACKAGE_VERSION@-@PACKAGE_RELEASE@-@host_cpu@.zip $(BINRLS)/$(SONAME) install-static: \ $(BINRLS)/static/$(LIBNAME).a @@ -584,7 +584,7 @@ clean: \ cleanDebug \ cleanRelease - @rm -fr $(BASEDIR)/.tmp/$(LIBNAME) + @rm -fr $(BUILDDIR)/.tmp/$(LIBNAME) @rm -fr $(POTDIR)/$(LIBNAME) @rm -fr src/include/marshal @rm -fr locale/$(LIBNAME).pot diff --git a/autogen.sh b/autogen.sh index 8532aa5..64affff 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,9 +1,11 @@ #!/bin/bash -test -n "$mydir" || mydir=$(readlink -f $(dirname "$0")) -test -n "$mydir" || mydir=. +builddir=${PWD} -cd "${mydir}" +test -n "$srcdir" || srcdir=`dirname "$0"` +test -n "$srcdir" || srcdir=. + +cd "$srcdir" mkdir -p scripts mkdir -p m4 @@ -45,7 +47,9 @@ automake --add-missing 2> /dev/null | true autopoint -test -n "$NOCONFIGURE" || "./configure" "$@" +cd "${builddir}" + +test -n "$NOCONFIGURE" || "$srcdir/configure" --srcdir=${srcdir} $@ diff --git a/configure.ac b/configure.ac index 0e7adce..762ae0f 100644 --- a/configure.ac +++ b/configure.ac @@ -361,7 +361,7 @@ dnl Directory config dnl --------------------------------------------------------------------------- AC_ARG_WITH([build-dir], [AS_HELP_STRING([--with-build-dir], [Setup build path])], [ app_cv_buildir="$withval" ],[ app_cv_buildir="$ac_pwd" ]) -AC_SUBST(BASEDIR,$app_cv_buildir) +AC_SUBST(BUILDDIR,$app_cv_buildir) dnl --------------------------------------------------------------------------- dnl Configure which files to generate. diff --git a/src/dialogs/colorscheme.c b/src/dialogs/colorscheme.c index b89791d..4be7b02 100644 --- a/src/dialogs/colorscheme.c +++ b/src/dialogs/colorscheme.c @@ -34,7 +34,7 @@ #include #include #include - #include "../terminal/marshal.h" + #include #define V3270_COLOR_BASE V3270_COLOR_GRAY+1 diff --git a/src/dialogs/settings/url.c b/src/dialogs/settings/url.c index 721f199..5d1875f 100644 --- a/src/dialogs/settings/url.c +++ b/src/dialogs/settings/url.c @@ -30,7 +30,7 @@ */ #include "private.h" - #include "marshal.h" + #include #include #include diff --git a/src/dialogs/settings/widget.c b/src/dialogs/settings/widget.c index 20affb4..7df1876 100644 --- a/src/dialogs/settings/widget.c +++ b/src/dialogs/settings/widget.c @@ -28,7 +28,7 @@ */ #include "../private.h" - #include "../terminal/marshal.h" + #include #include #include #include diff --git a/src/filetransfer/activitylist.c b/src/filetransfer/activitylist.c index a16623b..ca58031 100644 --- a/src/filetransfer/activitylist.c +++ b/src/filetransfer/activitylist.c @@ -30,7 +30,7 @@ #include #include #include "private.h" - #include "marshal.h" + #include /*--[ Widget definition ]----------------------------------------------------------------------------*/ diff --git a/src/filetransfer/settings.c b/src/filetransfer/settings.c index f5f0321..150e5af 100644 --- a/src/filetransfer/settings.c +++ b/src/filetransfer/settings.c @@ -30,7 +30,7 @@ #include #include #include "private.h" - #include "marshal.h" + #include #include /*--[ Widget definition ]----------------------------------------------------------------------------*/ diff --git a/src/filetransfer/v3270ftprogress.c b/src/filetransfer/v3270ftprogress.c index 7c79ec0..72851dd 100644 --- a/src/filetransfer/v3270ftprogress.c +++ b/src/filetransfer/v3270ftprogress.c @@ -36,7 +36,7 @@ */ #include "private.h" - #include "marshal.h" + #include #include #include diff --git a/src/filetransfer/worker.c b/src/filetransfer/worker.c index 885312f..510526a 100644 --- a/src/filetransfer/worker.c +++ b/src/filetransfer/worker.c @@ -30,7 +30,7 @@ #include #include #include "private.h" - #include "marshal.h" + #include #include /*--[ Widget definition ]----------------------------------------------------------------------------*/ diff --git a/src/terminal/widget.c b/src/terminal/widget.c index e0b4dc0..977076a 100644 --- a/src/terminal/widget.c +++ b/src/terminal/widget.c @@ -19,7 +19,7 @@ #include #include - #include "marshal.h" + #include #include #include diff --git a/src/trace/trace.c b/src/trace/trace.c index 3a5c6f1..caa3255 100644 --- a/src/trace/trace.c +++ b/src/trace/trace.c @@ -43,7 +43,7 @@ #include #include #include - #include "marshal.h" + #include /*--[ Globals ]--------------------------------------------------------------------------------------*/ -- libgit2 0.21.2