From 012921c0118bf471c7e222e881b26d84c28f439a Mon Sep 17 00:00:00 2001
From: perry.werneck@gmail.com <perry.werneck@gmail.com@d25448e0-c022-0410-b998-a785f7053de0>
Date: Tue, 12 Mar 2013 19:23:49 +0000
Subject: [PATCH] Pequenas correções no módulos DBUS & Rexx

---
 src/plugins/dbus3270/Makefile.in | 17 +++++++++++------
 src/plugins/dbus3270/test.sh     | 10 +---------
 src/plugins/rx3270/rxapimain.cc  |  8 ++++++--
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/plugins/dbus3270/Makefile.in b/src/plugins/dbus3270/Makefile.in
index 96a5fda..8924191 100644
--- a/src/plugins/dbus3270/Makefile.in
+++ b/src/plugins/dbus3270/Makefile.in
@@ -83,16 +83,16 @@ GLIB_LIBS=@GLIB_LIBS@
 GTK_LIBS=@GTK_LIBS@
 
 ifeq ($(LIB3270_MODE),Debug)
-	PW3270_LIBS="-L../../../.bin/Debug@DLLDIR@ -lpw3270"
-	PW3270_CFLAGS="-I../../../src/include"
-	LIB3270_LIBS="-L../../../.bin/Debug@DLLDIR@  -l3270"
+	PW3270_LIBS=-L../../../.bin/Debug@DLLDIR@ -lpw3270
+	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_CFLAGS="-I../../../src/include"
-	LIB3270_LIBS="-L../../../.bin/Release@DLLDIR@  -l3270"
+	PW3270_LIBS=-L../../../.bin/Release@DLLDIR@ -lpw3270
+	PW3270_CFLAGS=-I../../../src/include
+	LIB3270_LIBS=-L../../../.bin/Release@DLLDIR@  -l3270
 	LIB3270_CFLAGS=-I../../../src/include
 endif
 
@@ -125,6 +125,11 @@ $(BINRLS)/plugins/$(MODULE_NAME).so: $(foreach SRC, $(basename $(PLUGIN_SRC)), $
 	@$(MKDIR) `dirname $@`
 	$(LD) $(DLL_FLAGS) -Wl,-soname,`basename $@` $(LDFLAGS) -o $@ $^ $(LIBS) $(LIB3270_LIBS) $(PW3270_LIBS) $(GLIB_LIBS) $(GTK_LIBS) $(DBUS_LIBS)
 
+$(BINRLS)/@PACKAGE_NAME@d: $(foreach SRC, $(basename $(DAEMON_SRC)), $(OBJRLS)/$(SRC).o)
+	@echo "  CCLD `basename $@`"
+	@$(MKDIR) `dirname $@`
+	@$(CC) $(CFLAGS) -o $@ $^ $(DBUS_LIBS) $(GLIB_LIBS) $(LIB3270_LIBS)
+
 #---[ Debug targets ]----------------------------------------------------------
 
 Debug: $(BINDBG)/plugins/$(MODULE_NAME).so
diff --git a/src/plugins/dbus3270/test.sh b/src/plugins/dbus3270/test.sh
index 959ebce..adb9155 100755
--- a/src/plugins/dbus3270/test.sh
+++ b/src/plugins/dbus3270/test.sh
@@ -38,7 +38,7 @@ run_command()
 			;;
 
 		enter)
-			dbus-send --session  --print-reply --dest=$DEST $BPATH $DEST.enter
+			dbus-send --session  --print-reply --dest=$DEST.$SESSION $BPATH $DEST.enter
 			;;
 
 		*)
@@ -78,14 +78,6 @@ do
 
 		esac
 
-        elif [ -d $1 ]; then
-
-		IMGNAME=$1
-
-		if [ -e $IMGNAME/matriz.conf ]; then
-			. $IMGNAME/matriz.conf
-		fi
-
 	else
 		run_command $@
 		exit 0
diff --git a/src/plugins/rx3270/rxapimain.cc b/src/plugins/rx3270/rxapimain.cc
index c8e10ff..6d1a56c 100644
--- a/src/plugins/rx3270/rxapimain.cc
+++ b/src/plugins/rx3270/rxapimain.cc
@@ -59,6 +59,10 @@
 	int librx3270_unloaded(void) __attribute__((destructor));
 #endif
 
+	LIB3270_EXPORT RexxRoutineEntry rx3270_functions[];
+	LIB3270_EXPORT RexxPackageEntry rx3270_package_entry;
+
+
 	static enum rx3270mode active_mode = RX3270_MODE_UNDEFINED;
 
 /*--[ Implement ]------------------------------------------------------------------------------------*/
@@ -116,7 +120,7 @@ int librx3270_unloaded(void)
 }
 
 // now build the actual entry list
-LIB3270_EXPORT RexxRoutineEntry rx3270_functions[] =
+RexxRoutineEntry rx3270_functions[] =
 {
 	REXX_TYPED_ROUTINE(rx3270version, 				rx3270version),
 	REXX_TYPED_ROUTINE(rx3270QueryCState,			rx3270QueryCState),
@@ -139,7 +143,7 @@ LIB3270_EXPORT RexxRoutineEntry rx3270_functions[] =
 	REXX_LAST_METHOD()
 };
 
-LIB3270_EXPORT RexxPackageEntry rx3270_package_entry =
+RexxPackageEntry rx3270_package_entry =
 {
     STANDARD_PACKAGE_HEADER
     REXX_CURRENT_INTERPRETER_VERSION,		// anything after 4.0.0 will work
--
libgit2 0.21.2