From 773a48515667509756e01095f5538efa4fdaebca Mon Sep 17 00:00:00 2001 From: perry.werneck@gmail.com Date: Fri, 19 Apr 2013 10:57:45 +0000 Subject: [PATCH] Ajustes para poder compilar o pacote com outro nome --- src/include/plugin.mak.in | 5 +++-- src/plugins/dbus3270/Makefile.in | 5 +++-- src/plugins/hllapi/Makefile.in | 4 ++-- src/pw3270/Makefile.in | 4 ++-- src/pw3270/v3270/widget.c | 34 +++++++++++++++++----------------- 5 files changed, 27 insertions(+), 25 deletions(-) diff --git a/src/include/plugin.mak.in b/src/include/plugin.mak.in index 8e2c3b2..3e3763d 100644 --- a/src/include/plugin.mak.in +++ b/src/include/plugin.mak.in @@ -25,6 +25,7 @@ # PACKAGE_NAME=@PACKAGE_NAME@ +PACKAGE_TARNAME=@PACKAGE_TARNAME@ #---[ Sources ]---------------------------------------------------------------- @@ -75,7 +76,7 @@ DLL_NAME=@DLLDIR@/@DLLPREFIX@$(MODULE_NAME)@DLLEXT@ PLUGIN_NAME=plugins/$(MODULE_NAME)@DLLEXT@ ifeq ($(LIB3270_MODE),Debug) - PW3270_LIBS=-L../../../.bin/Debug@DLLDIR@ -lpw3270 + PW3270_LIBS=-L../../../.bin/Debug@DLLDIR@ -l$(PACKAGE_TARNAME) PW3270_CFLAGS=-I../../../src/include LIB3270_LIBS=-L../../../.bin/Debug@DLLDIR@ -l3270 LIB270_CFLAGS=-I../../../src/include @@ -83,7 +84,7 @@ endif ifeq ($(LIB3270_MODE),Release) BINRLS=../../../.bin/Release - PW3270_LIBS=-L$(BINRLS)@DLLDIR@ -lpw3270 + PW3270_LIBS=-L$(BINRLS)@DLLDIR@ -l$(PACKAGE_TARNAME) PW3270_CFLAGS=-I../../../src/include LIB3270_LIBS=-L$(BINRLS)@DLLDIR@ -l3270 LIB270_CFLAGS=-I../../../src/include diff --git a/src/plugins/dbus3270/Makefile.in b/src/plugins/dbus3270/Makefile.in index 9a79172..b0885fc 100644 --- a/src/plugins/dbus3270/Makefile.in +++ b/src/plugins/dbus3270/Makefile.in @@ -27,6 +27,7 @@ # PACKAGE_NAME=@PACKAGE_NAME@ +PACKAGE_TARNAME=@PACKAGE_TARNAME@ MODULE_NAME=dbus3270 prefix=@prefix@ @@ -83,14 +84,14 @@ GLIB_LIBS=@GLIB_LIBS@ GTK_LIBS=@GTK_LIBS@ ifeq ($(LIB3270_MODE),Debug) - PW3270_LIBS=-L../../../.bin/Debug@DLLDIR@ -lpw3270 + PW3270_LIBS=-L../../../.bin/Debug@DLLDIR@ -l$(PACKAGE_TARNAME) PW3270_CFLAGS=-I../../../src/include LIB3270_LIBS=-L../../../.bin/Debug@DLLDIR@ -l3270 LIB3270_CFLAGS=-I../../../src/include endif ifeq ($(LIB3270_MODE),Release) - PW3270_LIBS=-L../../../.bin/Release@DLLDIR@ -lpw3270 + PW3270_LIBS=-L../../../.bin/Release@DLLDIR@ -l$(PACKAGE_TARNAME) PW3270_CFLAGS=-I../../../src/include LIB3270_LIBS=-L../../../.bin/Release@DLLDIR@ -l3270 LIB3270_CFLAGS=-I../../../src/include diff --git a/src/plugins/hllapi/Makefile.in b/src/plugins/hllapi/Makefile.in index 0f0c00b..f0c1775 100644 --- a/src/plugins/hllapi/Makefile.in +++ b/src/plugins/hllapi/Makefile.in @@ -61,14 +61,14 @@ DEBUG_CFLAGS=-DDEBUG=1 -g -Wall LIB3270_MODE ?= Default ifeq ($(LIB3270_MODE),Debug) - PW3270_LIBS=-L../../../.bin/Debug@DLLDIR@ -lpw3270 -l3270 + PW3270_LIBS=-L../../../.bin/Debug@DLLDIR@ -l@PACKAGE_TARNAME@ -l3270 PW3270_CFLAGS=-I../../../src/include LIB3270_LIBS=-L../../../.bin/Debug@DLLDIR@ -l3270 LIB3270_CFLAGS=-I../../../src/include endif ifeq ($(LIB3270_MODE),Release) - PW3270_LIBS=-L../../../.bin/Release@DLLDIR@ -lpw3270 -l3270 + PW3270_LIBS=-L../../../.bin/Release@DLLDIR@ -l@PACKAGE_TARNAME@ -l3270 PW3270_CFLAGS=-I../../../src/include LIB3270_LIBS=-L../../../.bin/Release@DLLDIR@ -l3270 LIB3270_CFLAGS=-I../../../src/include diff --git a/src/pw3270/Makefile.in b/src/pw3270/Makefile.in index f58a140..70f35be 100644 --- a/src/pw3270/Makefile.in +++ b/src/pw3270/Makefile.in @@ -198,11 +198,11 @@ $(DEBDIR)/pw3270.install: Makefile v3270/marshal.h: v3270/genmarshal @$(MKDIR) `dirname $@` - @glib-genmarshal --prefix=$(PACKAGE_NAME) --header v3270/genmarshal > $@ + @glib-genmarshal --prefix=v3270 --header v3270/genmarshal > $@ v3270/marshal.c: v3270/genmarshal v3270/marshal.h @$(MKDIR) `dirname $@` - @glib-genmarshal --prefix=$(PACKAGE_NAME) --body v3270/genmarshal > $@ + @glib-genmarshal --prefix=v3270 --body v3270/genmarshal > $@ $(BINDIR)/pot/pw3270.pot: $(foreach SRC, $(basename $(APP_SOURCES) $(LIB_SOURCES)), $(TMPDIR)/pot/$(SRC).pot) @rm -f $@ diff --git a/src/pw3270/v3270/widget.c b/src/pw3270/v3270/widget.c index f40434a..6b00f31 100644 --- a/src/pw3270/v3270/widget.c +++ b/src/pw3270/v3270/widget.c @@ -404,7 +404,7 @@ static void v3270_class_init(v3270Class *klass) G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (v3270Class, activate), NULL, NULL, - pw3270_VOID__VOID, + v3270_VOID__VOID, G_TYPE_NONE, 0); v3270_widget_signal[SIGNAL_TOGGLE_CHANGED] = @@ -413,7 +413,7 @@ static void v3270_class_init(v3270Class *klass) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (v3270Class, toggle_changed), NULL, NULL, - pw3270_VOID__VOID_ENUM_BOOL_POINTER, + v3270_VOID__VOID_ENUM_BOOL_POINTER, G_TYPE_NONE, 3, G_TYPE_UINT, G_TYPE_BOOLEAN, G_TYPE_STRING); v3270_widget_signal[SIGNAL_MESSAGE_CHANGED] = @@ -422,7 +422,7 @@ static void v3270_class_init(v3270Class *klass) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (v3270Class, message_changed), NULL, NULL, - pw3270_VOID__VOID_ENUM, + v3270_VOID__VOID_ENUM, G_TYPE_NONE, 1, G_TYPE_UINT); v3270_widget_signal[SIGNAL_LUNAME_CHANGED] = @@ -431,7 +431,7 @@ static void v3270_class_init(v3270Class *klass) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (v3270Class, luname_changed), NULL, NULL, - pw3270_VOID__VOID_POINTER, + v3270_VOID__VOID_POINTER, G_TYPE_NONE, 1, G_TYPE_STRING); v3270_widget_signal[SIGNAL_KEYPRESS] = @@ -440,7 +440,7 @@ static void v3270_class_init(v3270Class *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (v3270Class, keypress), NULL, NULL, - pw3270_BOOL__VOID_UINT_ENUM, + v3270_BOOL__VOID_UINT_ENUM, G_TYPE_BOOLEAN, 2, G_TYPE_UINT, G_TYPE_UINT); v3270_widget_signal[SIGNAL_CONNECTED] = @@ -449,7 +449,7 @@ static void v3270_class_init(v3270Class *klass) G_SIGNAL_RUN_FIRST, 0, NULL, NULL, - pw3270_VOID__POINTER, + v3270_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_STRING); v3270_widget_signal[SIGNAL_DISCONNECTED] = @@ -458,7 +458,7 @@ static void v3270_class_init(v3270Class *klass) G_SIGNAL_RUN_FIRST, 0, NULL, NULL, - pw3270_VOID__VOID, + v3270_VOID__VOID, G_TYPE_NONE, 0); v3270_widget_signal[SIGNAL_UPDATE_CONFIG] = @@ -467,7 +467,7 @@ static void v3270_class_init(v3270Class *klass) G_SIGNAL_RUN_FIRST, 0, NULL, NULL, - pw3270_VOID__VOID_POINTER_POINTER, + v3270_VOID__VOID_POINTER_POINTER, G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING); v3270_widget_signal[SIGNAL_MODEL_CHANGED] = @@ -476,7 +476,7 @@ static void v3270_class_init(v3270Class *klass) G_SIGNAL_RUN_FIRST, 0, NULL, NULL, - pw3270_VOID__VOID_UINT_POINTER, + v3270_VOID__VOID_UINT_POINTER, G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_STRING); v3270_widget_signal[SIGNAL_SELECTING] = @@ -485,7 +485,7 @@ static void v3270_class_init(v3270Class *klass) G_SIGNAL_RUN_FIRST, 0, NULL, NULL, - pw3270_VOID__VOID_BOOL, + v3270_VOID__VOID_BOOL, G_TYPE_NONE, 1, G_TYPE_BOOLEAN); v3270_widget_signal[SIGNAL_POPUP] = @@ -494,7 +494,7 @@ static void v3270_class_init(v3270Class *klass) G_SIGNAL_RUN_LAST, 0, NULL, NULL, - pw3270_BOOL__VOID_BOOL_BOOL_POINTER, + v3270_BOOL__VOID_BOOL_BOOL_POINTER, G_TYPE_BOOLEAN, 3, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_POINTER); v3270_widget_signal[SIGNAL_PASTENEXT] = @@ -503,7 +503,7 @@ static void v3270_class_init(v3270Class *klass) G_SIGNAL_RUN_FIRST, 0, NULL, NULL, - pw3270_VOID__VOID_BOOL, + v3270_VOID__VOID_BOOL, G_TYPE_NONE, 1, G_TYPE_BOOLEAN); v3270_widget_signal[SIGNAL_CLIPBOARD] = @@ -512,7 +512,7 @@ static void v3270_class_init(v3270Class *klass) G_SIGNAL_RUN_FIRST, 0, NULL, NULL, - pw3270_VOID__VOID_BOOL, + v3270_VOID__VOID_BOOL, G_TYPE_NONE, 1, G_TYPE_BOOLEAN); v3270_widget_signal[SIGNAL_CHANGED] = @@ -521,7 +521,7 @@ static void v3270_class_init(v3270Class *klass) G_SIGNAL_RUN_FIRST, 0, NULL, NULL, - pw3270_VOID__VOID_UINT_UINT, + v3270_VOID__VOID_UINT_UINT, G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT); v3270_widget_signal[SIGNAL_MESSAGE] = @@ -530,7 +530,7 @@ static void v3270_class_init(v3270Class *klass) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (v3270Class, popup_message), NULL, NULL, - pw3270_VOID__VOID_UINT_POINTER_POINTER_POINTER, + v3270_VOID__VOID_UINT_POINTER_POINTER_POINTER, G_TYPE_NONE, 4, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING); v3270_widget_signal[SIGNAL_FIELD] = @@ -539,7 +539,7 @@ static void v3270_class_init(v3270Class *klass) G_SIGNAL_RUN_LAST, 0, NULL, NULL, - pw3270_BOOL__VOID_BOOL_UINT_POINTER, + v3270_BOOL__VOID_BOOL_UINT_POINTER, G_TYPE_BOOLEAN, 3, G_TYPE_BOOLEAN, G_TYPE_UINT, G_TYPE_POINTER); @@ -549,7 +549,7 @@ static void v3270_class_init(v3270Class *klass) G_SIGNAL_RUN_FIRST, 0, NULL, NULL, - pw3270_VOID__VOID, + v3270_VOID__VOID, G_TYPE_NONE, 0); } -- libgit2 0.21.2