From f609302fe07b6bf23a544d940b3cd5e027635d0e Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Fri, 9 Nov 2018 12:57:17 -0200 Subject: [PATCH] Revertendo commit errado. --- Makefile.in | 201 +++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------------------------------------- 1 file changed, 49 insertions(+), 152 deletions(-) diff --git a/Makefile.in b/Makefile.in index e1b3bb9..5694fad 100644 --- a/Makefile.in +++ b/Makefile.in @@ -24,192 +24,91 @@ # erico.mendonca@gmail.com (Erico Mascarenhas de Mendonça) # -#---[ Library configuration ]------------------------------------------------------------ +#---[ Configuration values ]--------------------------------------------------- -LIBNAME=@LIB3270_NAME@ +PACKAGE_NAME=@PACKAGE_NAME@ +PACKAGE_VERSION=@PACKAGE_VERSION@ +PACKAGE_LEVEL=@PACKAGE_LEVEL@ +PACKAGE_TARNAME=@PACKAGE_TARNAME@ +PACKAGE_DESCRIPTION=@PACKAGE_DESCRIPTION@ +PLUGINS=@PLUGINS@ -SOURCES= \ - $(wildcard src/lib3270/*.c) \ - $(wildcard src/lib3270/@OSNAME@/*.c) \ - $(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@ -INSTALL=@INSTALL@ -INSTALL_DATA=@INSTALL_DATA@ -INSTALL_PROGRAM=@INSTALL_PROGRAM@ - -#---[ Paths ]---------------------------------------------------------------------------- +#---[ Paths ]------------------------------------------------------------------ prefix=@prefix@ exec_prefix=@exec_prefix@ bindir=@bindir@ sbindir=@sbindir@ libdir=@libdir@ -includedir=@includedir@ datarootdir=@datarootdir@ -localedir=@localedir@ +localedir=${datarootdir}/locale docdir=@docdir@ sysconfdir=@sysconfdir@ +mandir=@mandir@ BASEDIR=@BASEDIR@ -OBJDIR=$(BASEDIR)/.obj/@DLLPREFIX@$(LIBNAME) -OBJDBG=$(OBJDIR)/Debug -OBJRLS=$(OBJDIR)/Release - -BINDIR=$(BASEDIR)/.bin/@DLLPREFIX@$(LIBNAME) +POTDIR=$(BASEDIR)/.pot +BINDIR=$(BASEDIR)/.bin BINDBG=$(BINDIR)/Debug BINRLS=$(BINDIR)/Release -#---[ Rules ]---------------------------------------------------------------------------- - -DEPENDS= \ - Makefile \ - src/include/*.h \ - src/include/lib3270/*.h \ - src/lib3270/*.h - +#---[ Tools ]------------------------------------------------------------------ -CFLAGS= \ - @CFLAGS@ \ - -g \ - -Isrc/include - -DBUILD_DATE=`date +%Y%m%d` \ - @LIBSSL_CFLAGS@ - -LIBS= \ - @LIBS@ \ - @LIBSSL_LIBS@ - -#---[ Debug Rules ]---------------------------------------------------------------------- - -$(OBJDBG)/%.o: \ - %.c \ - $(DEPENDS) - - @echo $< ... - @$(MKDIR) `dirname $@` - @$(CC) \ - $(CFLAGS) \ - -Wall -Wextra -fstack-check \ - -DDEBUG=1 \ - -DDATADIR=$(BASEDIR) \ - -o $@ -c $< - -#---[ Release Rules ]-------------------------------------------------------------------- - -$(OBJRLS)/%.o: \ - %.c \ - $(DEPENDS) - - @echo $< ... - @$(MKDIR) `dirname $@` - @$(CC) \ - $(CFLAGS) \ - -DNDEBUG=1 \ - -DDATADIR=$(datarootdir)/pw3270 \ - -o $@ -c $< +CC=@CC@ +LD=@CC@ +LN_S=@LN_S@ +MKDIR=@MKDIR_P@ +INSTALL=@INSTALL@ +INSTALL_DATA=@INSTALL_DATA@ +INSTALL_PROGRAM=@INSTALL_PROGRAM@ #---[ Release Targets ]------------------------------------------------------------------ all: \ - $(BINRLS)/@DLLPREFIX@$(LIBNAME)@DLLEXT@ + $(BINRLS)/@DLLPREFIX@3270@DLLEXT@ \ + $(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@ Release: \ - $(BINRLS)/@DLLPREFIX@$(LIBNAME)@DLLEXT@ - -$(BINRLS)/@DLLPREFIX@$(LIBNAME)@DLLEXT@: \ - $(BINRLS)/@DLLPREFIX@$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@ - - @echo $< ... - @rm -f $@ - @$(LN_S) \ - @DLLPREFIX@$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@ \ - $@ + $(BINRLS)/@DLLPREFIX@3270@DLLEXT@ \ + $(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@ -$(BINRLS)/@DLLPREFIX@$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@: \ - $(BINRLS)/@DLLPREFIX@$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ - @rm -f $@ - @$(LN_S) \ - @DLLPREFIX@$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ \ - $@ - -$(BINRLS)/@DLLPREFIX@$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \ - $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC).o) +$(BINRLS)/@DLLPREFIX@3270@DLLEXT@: \ + submodules/lib3270/* \ + submodules/lib3270/src/lib3270/* \ + submodules/lib3270/src/include/* @$(MKDIR) `dirname $@` - @echo $< ... - @$(LD) \ - -shared -Wl,-soname,$(@F) \ - -o $@ \ - $(LDFLAGS) \ - $(LIBS) - -#---[ Misc Targets ]--------------------------------------------------------------------- + $(MAKE) -C submodules/lib3270 Release -src/lib3270/version.c: \ - Makefile + @cp ./submodules/lib3270/.bin/lib3270/Debug/* $(BINRLS) - @echo $(basename $@) ... - @chmod +x src/lib3270/mkversion.sh - @./src/lib3270/mkversion.sh +#---[ Debug Rules ]---------------------------------------------------------------------- -$(BASEDIR)/.tmp/@DLLPREFIX@$(LIBNAME)/fallbacks.c: \ - X3270.xad \ - $(wildcard src/mkfb/*.c) +$(BINDBG)/@DLLPREFIX@3270@DLLEXT@: \ + submodules/lib3270/* \ + submodules/lib3270/src/lib3270/* \ + submodules/lib3270/src/include/* @$(MKDIR) `dirname $@` - @echo $< ... - $(HOST_CC) -g -o $(BINDIR)/mkfb@EXEEXT@ $(wildcard src/mkfb/*.c) - $(BINDIR)/mkfb@EXEEXT@ -c X3270.xad $@ + @$(MAKE) -C submodules/lib3270 Debug -#---[ Install Targets ]------------------------------------------------------------------ + @cp ./submodules/lib3270/.bin/lib3270/Debug/* $(BINDBG) +$(BINDBG)/%@EXEEXT@: \ + $(BINDBG)/@DLLPREFIX@3270@DLLEXT@ \ + src/% \ + src/%/* -#---[ Debug Targets ]-------------------------------------------------------------------- - -x: \ - $(BASEDIR)/.tmp/@DLLPREFIX@$(LIBNAME)/fallbacks.c + @make -C src/$(notdir $(basename $@)) $@ -Debug: \ - $(BINDBG)/@DLLPREFIX@$(LIBNAME)@DLLEXT@ -$(BINDBG)/@DLLPREFIX@$(LIBNAME)@DLLEXT@: \ - $(BINDBG)/@DLLPREFIX@$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@ - - @echo $< ... - @rm -f $@ - @$(LN_S) \ - @DLLPREFIX@$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@ \ - $@ - -$(BINDBG)/@DLLPREFIX@$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@: \ - $(BINDBG)/@DLLPREFIX@$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ - - @rm -f $@ - @$(LN_S) \ - @DLLPREFIX@$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ \ - $@ - -$(BINDBG)/@DLLPREFIX@$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \ - $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC).o) +#---[ Debug Targets ]-------------------------------------------------------------------- - @$(MKDIR) `dirname $@` - @echo $< ... - @$(LD) \ - -shared -Wl,-soname,$(@F) \ - -o $@ \ - $(LDFLAGS) \ - $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC).o) \ - $(LIBS) +Debug: \ + $(BINDBG)/@DLLPREFIX@3270@DLLEXT@ \ + $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@ #---[ Clean Targets ]-------------------------------------------------------------------- @@ -217,20 +116,18 @@ clean: \ cleanDebug \ cleanRelease - @rm -fr $(BASEDIR)/.tmp/@DLLPREFIX@$(LIBNAME) - cleanDebug: @rm -fr $(OBJDBG) @rm -fr $(BINDBG) + @$(MAKE) -C submodules/lib3270 $@ cleanRelease: @rm -fr $(OBJRLS) @rm -fr $(BINRLS) + @$(MAKE) -C submodules/lib3270 $@ + -clean: \ - cleanDebug \ - cleanRelease -- libgit2 0.21.2