From 43a6be91fc30e676ab960105f88a2a89331ce06f Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Fri, 9 Nov 2018 11:53:42 -0200 Subject: [PATCH] Reincluindo geração automática do arquivo de fallbacks. --- Makefile.in | 18 +++++++++++++++++- configure.ac | 12 ++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in index c4e4c83..e1b3bb9 100644 --- a/Makefile.in +++ b/Makefile.in @@ -31,11 +31,13 @@ LIBNAME=@LIB3270_NAME@ SOURCES= \ $(wildcard src/lib3270/*.c) \ $(wildcard src/lib3270/@OSNAME@/*.c) \ - $(wildcard src/lib3270/@OSNAME@/*.rc) + $(wildcard src/lib3270/@OSNAME@/*.rc) \ + $(BASEDIR)/.tmp/@DLLPREFIX@$(LIBNAME)/fallbacks.c #---[ Tools ]---------------------------------------------------------------------------- CC=@CC@ +HOST_CC=@HOST_CC@ LD=@CC@ LN_S=@LN_S@ MKDIR=@MKDIR_P@ @@ -160,11 +162,23 @@ src/lib3270/version.c: \ @chmod +x src/lib3270/mkversion.sh @./src/lib3270/mkversion.sh +$(BASEDIR)/.tmp/@DLLPREFIX@$(LIBNAME)/fallbacks.c: \ + X3270.xad \ + $(wildcard src/mkfb/*.c) + + @$(MKDIR) `dirname $@` + @echo $< ... + $(HOST_CC) -g -o $(BINDIR)/mkfb@EXEEXT@ $(wildcard src/mkfb/*.c) + $(BINDIR)/mkfb@EXEEXT@ -c X3270.xad $@ + #---[ Install Targets ]------------------------------------------------------------------ #---[ Debug Targets ]-------------------------------------------------------------------- +x: \ + $(BASEDIR)/.tmp/@DLLPREFIX@$(LIBNAME)/fallbacks.c + Debug: \ $(BINDBG)/@DLLPREFIX@$(LIBNAME)@DLLEXT@ @@ -203,6 +217,8 @@ clean: \ cleanDebug \ cleanRelease + @rm -fr $(BASEDIR)/.tmp/@DLLPREFIX@$(LIBNAME) + cleanDebug: @rm -fr $(OBJDBG) diff --git a/configure.ac b/configure.ac index 2bc2411..dbb2058 100644 --- a/configure.ac +++ b/configure.ac @@ -110,6 +110,18 @@ AC_SUBST(DLLEXT) AC_SUBST(DLLPREFIX) dnl --------------------------------------------------------------------------- +dnl Check host compiler +dnl --------------------------------------------------------------------------- + +if test $host != $build; then + AC_CHECK_PROGS(HOST_CC, gcc cc) +else + HOST_CC=$CC +fi + +AC_SUBST(HOST_CC) + +dnl --------------------------------------------------------------------------- dnl Check for other programs dnl --------------------------------------------------------------------------- -- libgit2 0.21.2