diff --git a/.gitignore b/.gitignore index 2eac476..1099e45 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,6 @@ configure config.h stamp-h1 +Makefile +dbus-glue.h + diff --git a/Makefile.in b/Makefile.in new file mode 100644 index 0000000..f981508 --- /dev/null +++ b/Makefile.in @@ -0,0 +1,237 @@ +# +# "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., 59 Temple +# Place, Suite 330, Boston, MA, 02111-1307, USA +# +# Contatos: +# +# perry.werneck@gmail.com (Alexandre Perry de Souza Werneck) +# erico.mendonca@gmail.com (Erico Mascarenhas de Mendonça) +# + +SOURCES=gobject.c iocallback.c main.c session.c status.c tn3270glue.c + +#---[ Configuration values ]------------------------------------------------------------- + +PACKAGE_NAME=@PACKAGE_NAME@ +PACKAGE_VERSION=@PACKAGE_VERSION@ +PACKAGE_TARNAME=@PACKAGE_TARNAME@ + +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +sbindir=@sbindir@ +libdir=@libdir@ + +BASEDIR=@BASEDIR@ +SRCDIR=$(BASEDIR)/.src/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION) + +OBJDIR=$(BASEDIR)/.obj +OBJDBG=$(OBJDIR)/Debug +OBJRLS=$(OBJDIR)/Release + +BINDIR=$(BASEDIR)/.bin +BINDBG=$(BINDIR)/Debug +BINRLS=$(BINDIR)/Release + +INSTALL=@INSTALL@ +INSTALL_DATA=@INSTALL_DATA@ +INSTALL_PROGRAM=@INSTALL_PROGRAM@ + +LN_S=@LN_S@ +DBUSBINDING=@DBUSBINDING@ +VALGRIND=@VALGRIND@ +AMTAR=@AMTAR@ +SHELL=@SHELL@ +STRIP=@STRIP@ +MKDIR=@MKDIR_P@ +RPMBUILD=@RPMBUILD@ + +CC=@CC@ +LD=@CC@ + +LIBS=@LIBS@ @LIBICONV@ @DBUS_LIBS@ @GLIB_LIBS@ @LIB3270_LIBS@ +CFLAGS=@CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ @LIB3270_CFLAGS@ +LDFLAGS=@LDFLAGS@ + +#---[ Rules ]---------------------------------------------------------------------------- + +DEPENDS=Makefile src/config.h src/private.h src/service.h src/dbus-glue.h + +$(OBJDBG)/%.o: \ + src/%.c \ + $(DEPENDS) + + @echo $< ... + @$(MKDIR) `dirname $@` + @$(CC) $(CFLAGS) -fstack-check -DDEBUG=1 \ + -DBUILD_DATE=`date +"0x%Y%m%d"`\ + -g -o $@ -c $< + +$(OBJRLS)/%.o: \ + src/%.c \ + $(DEPENDS) + + @echo $< ... + @$(MKDIR) `dirname $@` + @$(CCC) $(CFLAGS) -DNDEBUG=1 \ + -DBUILD_DATE=`date +"0x%Y%m%d"` \ + -o $@ -c $< + +src/dbus-glue.h: \ + src/pw3270service.xml + + @$(DBUSBINDING) --mode=glib-server --output=src/dbus-glue.h --prefix=pw3270_dbus src/pw3270service.xml + + +%.tar.bz2: \ + %.tar + + @echo $< ... + @bzip2 --compress -9 --stdout $< > $@ + @chmod 0644 $@ + +%.tar.gz: \ + %.tar + + @echo $< ... + @gzip -9 --stdout $< > $@ + @chmod 0644 $@ + +#---[ Release Targets ]------------------------------------------------------------------ + +all: \ + $(BINRLS)/$(PACKAGE_NAME) + +Release: \ + $(BINRLS)/$(PACKAGE_NAME) + +install: \ + $(BINRLS)/$(PACKAGE_NAME) + +bz2: \ + $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.bz2 + +rpm: \ + $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.bz2 \ + rpm/$(PACKAGE_NAME).spec \ + Makefile + + $(MKDIR) $(BASEDIR)/rpm + $(MKDIR) $(BASEDIR)/rpm/SPECS + $(MKDIR) $(BASEDIR)/rpm/SOURCES + $(MKDIR) $(BASEDIR)/rpm/SRPMS + $(MKDIR) $(BASEDIR)/rpm/RPMS + $(MKDIR) $(BASEDIR)/rpm/BUILD + $(MKDIR) $(BASEDIR)/rpm/BUILDROOT + umask 002 ; $(RPMBUILD) \ + --define="_topdir $(BASEDIR)/rpm" \ + --define="_packager $(USER)@$(HOSTNAME)" \ + --clean \ + -ta $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.bz2 + +srpm: \ + $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.bz2 \ + rpm/$(PACKAGE_NAME).spec \ + Makefile + + @$(MKDIR) $(BASEDIR)/rpm + @$(MKDIR) $(BASEDIR)/rpm/SPECS + @$(MKDIR) $(BASEDIR)/rpm/SOURCES + @$(MKDIR) $(BASEDIR)/rpm/SRPMS + @$(MKDIR) $(BASEDIR)/rpm/RPMS + @$(MKDIR) $(BASEDIR)/rpm/BUILD + @$(MKDIR) $(BASEDIR)/rpm/BUILDROOT + @umask 002 ; $(RPMBUILD) \ + --define="_topdir $(PWD)/rpm" \ + --define="_packager $(USER)@$(HOSTNAME)" \ + --clean \ + -ts $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.bz2 + +$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar: \ + $(SRCDIR) \ + Makefile + + @$(AMTAR) \ + --verbose \ + --format=ustar \ + --create \ + --exclude-vcs \ + --directory $(BASEDIR)/.src \ + --owner=root \ + --group=root \ + --file=$@ \ + $(PACKAGE_TARNAME)-@PACKAGE_VERSION@ + + +$(SRCDIR): \ + clean \ + Makefile + + # Copia fontes + @$(MKDIR) $(SRCDIR)/src + @cp src/*.c $(SRCDIR)/src + @cp src/*.h $(SRCDIR)/src + @cp src/*.xml $(SRCDIR)/src + + # Copia extras + @cp -r scripts $(SRCDIR) + @cp -r testprograms $(SRCDIR) + + # Copia documentos + @cp AUTHORS $(SRCDIR) + @cp LICENCA $(SRCDIR) + @cp LICENSE $(SRCDIR) + @cp README.md $(SRCDIR) + + # Copia configuradores + @cp configure.ac $(SRCDIR) + @cp *.in $(SRCDIR) + @cp *.cbp $(SRCDIR) + @cp rpm/*.spec $(SRCDIR) + + +$(BINRLS)/$(PACKAGE_NAME): \ + $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC).o) + + @echo $(basename $@) ... + @$(MKDIR) `dirname $@` + @$(LD) $(LDFLAGS) -o $@ $^ $(LIBS) + +Debug: \ + $(BINDBG)/$(PACKAGE_NAME) + +$(BINDBG)/$(PACKAGE_NAME): \ + $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC).o) + + @echo $(basename $@) ... + @$(MKDIR) `dirname $@` + @$(LD) $(LDFLAGS) -o $@ $^ $(LIBS) + +run: \ + $(BINDBG)/$(PACKAGE_NAME) + + $(BINDBG)/$(PACKAGE_NAME) + +clean: + + @rm -fr $(BINDIR) + @rm -fr $(OBJDIR) + @rm -f src/dbus-glue.h + + diff --git a/configure.ac b/configure.ac index 6551aff..00a1277 100644 --- a/configure.ac +++ b/configure.ac @@ -198,6 +198,7 @@ AC_PATH_TOOL([MSGCAT], [msgcat], [no]) AC_PATH_TOOL([MSGINIT], [msginit], [no]) AC_PATH_TOOL([MSGMERGE], [msgmerge], [no]) AC_PATH_TOOL([MSGFMT], [msgfmt], [no]) +AC_PATH_TOOL([DBUSBINDING], [dbus-binding-tool], [dbus-binding-tool]) AC_CHECK_HEADER(libintl.h, [ AC_DEFINE(HAVE_LIBINTL, 1) @@ -334,7 +335,7 @@ dnl --------------------------------------------------------------------------- dnl Configure which files to generate. dnl --------------------------------------------------------------------------- -dnl AC_CONFIG_FILES(Makefile) +AC_CONFIG_FILES(Makefile) dnl --------------------------------------------------------------------------- dnl Output the generated config.status script. diff --git a/src/main.c b/src/main.c index f6e7496..3ee766e 100644 --- a/src/main.c +++ b/src/main.c @@ -34,9 +34,10 @@ #include #include #include -#include - #include "service.h" + +#pragma GCC diagnostic ignored "-Wunused-function" +#include #include "dbus-glue.h" #include "private.h" diff --git a/src/session.c b/src/session.c index 30f5d08..f7b383c 100644 --- a/src/session.c +++ b/src/session.c @@ -27,6 +27,7 @@ */ #include "private.h" + #include /*---[ Implement ]----------------------------------------------------------------------------------*/ -- libgit2 0.21.2