From 1412dcf976a5dc08b85144368a3d5586029c436a Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Wed, 18 Jan 2017 11:57:11 -0200 Subject: [PATCH] Reimplementando criação dos arquivos de linguagem. --- Makefile.in | 15 +++++++++++++++ src/lib3270/Makefile.in | 30 ++++++++++++++++++++++++++++-- src/pw3270/Makefile.in | 26 +++++++++++++++++++++++++- 3 files changed, 68 insertions(+), 3 deletions(-) diff --git a/Makefile.in b/Makefile.in index 696b39a..41dc82c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -46,6 +46,7 @@ sysconfdir=@sysconfdir@ mandir=@mandir@ BASEDIR=@BASEDIR@ +POTDIR=$(BASEDIR)/.pot BINDIR=$(BASEDIR)/.bin BINDBG=$(BINDIR)/Debug @@ -80,6 +81,13 @@ $(BINRLS)/%@DLLEXT@: \ @$(MAKE) -C src/$(basename $(notdir $@)) $@ +$(POTDIR)/%.pot: \ + $(DEPENDS) \ + ./src/%/* + + @$(MAKE) -C src/$(basename $(notdir $@)) $@ + + $(DESTDIR)$(libdir)/%@DLLEXT@: \ $(DEPENDS) \ ./src/%/* @@ -110,6 +118,11 @@ Release: \ $(BINRLS)/lib3270@DLLEXT@ \ $(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@ +pot: \ + $(POTDIR)/lib3270.pot \ + $(POTDIR)/pw3270.pot + + install: \ $(DESTDIR)$(libdir)/lib3270@DLLEXT@ \ $(DESTDIR)$(libdir)/$(PACKAGE_TARNAME)@EXEEXT@ @@ -153,5 +166,7 @@ clean: \ cleanRelease @rm -fr $(BINDIR) + @rm -fr $(POTDIR) + diff --git a/src/lib3270/Makefile.in b/src/lib3270/Makefile.in index d72d969..e4863c4 100644 --- a/src/lib3270/Makefile.in +++ b/src/lib3270/Makefile.in @@ -48,6 +48,8 @@ libdir=@libdir@ BASEDIR=@BASEDIR@ +POTDIR=$(BASEDIR)/.pot/lib3270 + OBJDIR=$(BASEDIR)/.obj/lib3270 OBJDBG=$(OBJDIR)/Debug OBJRLS=$(OBJDIR)/Release @@ -65,6 +67,8 @@ LN_S=@LN_S@ AMTAR=@AMTAR@ SHELL=@SHELL@ MKDIR=@MKDIR_P@ +XGETTEXT=@XGETTEXT@ +MSGCAT=@MSGCAT@ CC=@CC@ LD=@CC@ @@ -100,6 +104,21 @@ $(OBJRLS)/%.o: \ -o $@ -c $< +$(POTDIR)/%.pot: %.c + + @echo $< ... + @$(MKDIR) `dirname $@` + @$(XGETTEXT) \ + --default-domain=$(PACKAGE) \ + --language=C \ + --keyword=_ \ + --keyword=N_ \ + --keyword=MSG_:2 \ + --output=$@ \ + $< + + @touch $@ + #---[ Release Targets ]------------------------------------------------------------------ all: \ @@ -108,6 +127,13 @@ all: \ Release: \ $(BINRLS)/$(LIBNAME) +$(BASEDIR)/.pot/lib3270.pot: \ + $(foreach SRC, $(basename $(SOURCES)), $(POTDIR)/$(SRC).pot) + + @rm -f $@ + @mkdir -p `dirname $@` + @$(MSGCAT) --sort-output $^ > $@ + $(BINRLS)/$(LIBNAME): \ $(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@ @@ -186,7 +212,8 @@ cleanRelease: @rm -fr $(OBJRLS) \ $(BINRLS)/$(LIBNAME) \ $(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@ \ - $(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ + $(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ \ + $(POTDIR) clean: \ cleanDebug \ @@ -194,4 +221,3 @@ clean: \ - diff --git a/src/pw3270/Makefile.in b/src/pw3270/Makefile.in index 0a429e5..db7957a 100644 --- a/src/pw3270/Makefile.in +++ b/src/pw3270/Makefile.in @@ -49,6 +49,8 @@ desktopdir=$(datarootdir)/applications BASEDIR=@BASEDIR@ +POTDIR=$(BASEDIR)/.pot/$(PACKAGE_TARNAME) + OBJDIR=.obj OBJDBG=$(OBJDIR)/Debug OBJRLS=$(OBJDIR)/Release @@ -66,9 +68,10 @@ LN_S=@LN_S@ AMTAR=@AMTAR@ SHELL=@SHELL@ MKDIR=@MKDIR_P@ - CC=@CC@ LD=@CC@ +XGETTEXT=@XGETTEXT@ +MSGCAT=@MSGCAT@ CFLAGS=@CFLAGS@ @LIB3270_CFLAGS@ \ -Wno-deprecated-declarations \ @@ -113,6 +116,20 @@ $(OBJRLS)/%.o: \ -DBUILD_DATE=`date +"0x%Y%m%d"` \ -o $@ -c $< +$(POTDIR)/%.pot: %.c + + @echo $< ... + @$(MKDIR) `dirname $@` + @$(XGETTEXT) \ + --default-domain=$(PACKAGE) \ + --language=C \ + --keyword=_ \ + --keyword=N_ \ + --keyword=MSG_:2 \ + --output=$@ \ + $< + + @touch $@ #---[ Release Targets ]------------------------------------------------------------------ @@ -122,6 +139,13 @@ all: \ Release: \ $(BINRLS)/$(PACKAGE_TARNAME)$(EXEEXT) +$(BASEDIR)/.pot/pw3270.pot: \ + $(foreach SRC, $(basename $(LIB_SOURCES) $(APP_SOURCES)), $(POTDIR)/$(SRC).pot) + + @rm -f $@ + @mkdir -p `dirname $@` + @$(MSGCAT) --sort-output $^ > $@ + $(BINRLS)/$(PACKAGE_TARNAME)$(EXEEXT): \ $(BINRLS)/$(LIBNAME) \ $(foreach SRC, $(basename $(APP_SOURCES)), $(OBJRLS)/$(SRC).o) -- libgit2 0.21.2