Corrigindo alteração indevida no Makefile do plugin rexx, removendo trace no makefile do plugin dbus

perry.werneck@gmail.com
1 parent 791a767f
Showing 3 changed files with 44 additions and 22 deletions Show diff stats
po/pt_BR.po
src/plugins/dbus3270/Makefile.in
src/plugins/rx3270/Makefile.in
@@ -5,7 +5,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: pw3270 5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-16 08:48-0300\n"
+"POT-Creation-Date: 2014-04-23 09:34-0300\n"
 "PO-Revision-Date: 2014-02-17 08:05-0300\n"
 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
 "Language-Team: Portugues <>\n"
@@ -20,7 +20,7 @@ msgstr &quot;&quot;
 "X-Generator: Gtranslator 2.91.6\n"
  
 #: telnet.c:1055 ssl.c:261 ssl.c:314 connect.c:98 connect.c:114 connect.c:116
-#: connect.c:572 connect.c:589
+#: connect.c:570 connect.c:587
 #, c-format
 msgid "%s"
 msgstr "%s"
@@ -364,7 +364,7 @@ msgstr &quot;Tema de c_ores:&quot;
 msgid "C_onnect"
 msgstr "_Conectar"
  
-#: toggles.c:313 connect.c:364 connect.c:459
+#: toggles.c:313 connect.c:362 connect.c:457
 #, c-format
 msgid "Can't %s network keep-alive"
 msgstr "Não foi possível %s opção \"keep-alive\""
@@ -374,12 +374,12 @@ msgstr &quot;Não foi possível %s opção \&quot;keep-alive\&quot;&quot;
 msgid "Can't accept unnamed %s"
 msgstr "Não posso aceitar elemento %s sem nome"
  
-#: connect.c:106 connect.c:395
+#: connect.c:106 connect.c:393
 #, c-format
 msgid "Can't connect to %s"
 msgstr "Não foi possível conectar a %s"
  
-#: connect.c:276 connect.c:429
+#: connect.c:274 connect.c:427
 #, c-format
 msgid "Can't connect to %s:%s"
 msgstr "Não foi possível conectar a %s:%s"
@@ -481,11 +481,11 @@ msgstr &quot;Não foi possível definir o charset do host&quot;
 msgid "Can't set lib3270 I/O handlers"
 msgstr "Não foi possível registrar manipuladores de I/O 3270"
  
-#: connect.c:588
+#: connect.c:586
 msgid "Can't set socket to blocking mode."
 msgstr "Não foi possível mudar o socket para o modo blocante."
  
-#: connect.c:588
+#: connect.c:586
 msgid "Can't set socket to non blocking mode"
 msgstr "Não foi possível setar o socket para o modo não blocante."
  
@@ -608,9 +608,9 @@ msgstr &quot;Configurar host&quot;
 msgid "Connect on startup"
 msgstr "Conectar ao iniciar"
  
-#: connect.c:199 connect.c:297 connect.c:306 connect.c:368 connect.c:383
-#: connect.c:399 connect.c:413 connect.c:433 connect.c:447 connect.c:463
-#: connect.c:557
+#: connect.c:199 connect.c:295 connect.c:304 connect.c:366 connect.c:381
+#: connect.c:397 connect.c:411 connect.c:431 connect.c:445 connect.c:461
+#: connect.c:555
 msgid "Connection error"
 msgstr "Erro de conexão"
  
@@ -1486,7 +1486,7 @@ msgstr &quot;Erro SSL&quot;
 msgid "SSL Read error"
 msgstr "Erro de leitura SSL"
  
-#: connect.c:334
+#: connect.c:332
 msgid "SSL error"
 msgstr "Erro SSL"
  
@@ -1683,7 +1683,7 @@ msgstr &quot;Show timer when processing&quot;
 msgid "Smart paste"
 msgstr "Colar inteligente"
  
-#: connect.c:570 connect.c:587
+#: connect.c:568 connect.c:585
 msgid "Socket error"
 msgstr "Erro no socket"
  
@@ -2003,7 +2003,7 @@ msgstr &quot;&quot;
 msgid "This program requires GTK version %d.%d.%d"
 msgstr "Este programa precisa do GTK versão %d.%d.%d"
  
-#: connect.c:336
+#: connect.c:334
 #, c-format
 msgid ""
 "This version of %s was built without support for secure sockets layer (SSL)."
@@ -2085,7 +2085,7 @@ msgstr &quot;UTF-8&quot;
 msgid "Uknown DFT Open type from host"
 msgstr "Host enviou código de abertura DFT desconhecido"
  
-#: connect.c:335
+#: connect.c:333
 msgid "Unable to connect to secure hosts"
 msgstr "Não é possível conectar em servidores seguros"
  
@@ -2463,23 +2463,23 @@ msgstr &quot;um atributo \&quot;action\&quot;&quot;
 msgid "bracket"
 msgstr "bracket"
  
-#: toggles.c:313 connect.c:364 connect.c:459
+#: toggles.c:313 connect.c:362 connect.c:457
 msgid "disable"
 msgstr "desabilitar"
  
-#: toggles.c:313 connect.c:364 connect.c:459
+#: toggles.c:313 connect.c:362 connect.c:457
 msgid "enable"
 msgstr "enable"
  
-#: connect.c:571
+#: connect.c:569
 msgid "fcntl() error when getting socket state."
 msgstr "fcntl() error when getting socket state."
  
-#: connect.c:384 connect.c:558
+#: connect.c:382 connect.c:556
 msgid "ioctlsocket(FIONBIO) failed."
 msgstr "ioctlsocket(FIONBIO) failed."
  
-#: connect.c:414 connect.c:448
+#: connect.c:412 connect.c:446
 msgid "setsockopt(SO_OOBINLINE) has failed"
 msgstr "setsockopt(SO_OOBINLINE) has failed"
  
@@ -122,7 +122,7 @@ Release: $(BINRLS)/plugins/$(MODULE_NAME).so
 $(BINRLS)/plugins/$(MODULE_NAME).so: $(foreach SRC, $(basename $(PLUGIN_SRC)), $(OBJRLS)/$(SRC).o)
 	@echo "  CCLD `basename $@`"
 	@$(MKDIR) `dirname $@`
-	$(LD) $(DLL_FLAGS) -Wl,-soname,`basename $@` $(LDFLAGS) -o $@ $^ $(LIBS) $(LIB3270_LIBS) $(PW3270_LIBS) $(GLIB_LIBS) $(GTK_LIBS) $(GDBUS_LIBS)
+	@$(LD) $(DLL_FLAGS) -Wl,-soname,`basename $@` $(LDFLAGS) -o $@ $^ $(LIBS) $(LIB3270_LIBS) $(PW3270_LIBS) $(GLIB_LIBS) $(GTK_LIBS) $(GDBUS_LIBS)
  
 $(BINRLS)/@PACKAGE_NAME@d: $(foreach SRC, $(basename $(DAEMON_SRC)), $(OBJRLS)/$(SRC).o)
 	@echo "  CCLD `basename $@`"
@@ -47,7 +47,6 @@ LIBS=@REXX_LIBS@ @LIBICONV@ @DBUS_LIBS@
 CFLAGS=@REXX_CFLAGS@ @DBUS_CFLAGS@
 REXX_HOME=@REXX_HOME@
 REXXLIBDIR=@REXX_LIBDIR@
-SYSDLL_FLAGS=@SYSDLL_FLAGS@
  
 #---[ Debug Targets ]----------------------------------------------------------
  
@@ -59,5 +58,28 @@ $(BINDBG)/$(PLUGIN_NAME): $(foreach SRC, $(basename $(PLUGIN_SRC)), $(OBJDBG)/$(
 $(BINDBG)$(DLL_NAME).$(VERSION): $(foreach SRC, $(basename $(EXTAPI_SRC)), $(OBJDBG)/$(SRC)@OBJEXT@) $(CLASS_DEBUG_OBJECTS)
 	@echo "  CCLD `basename $@`"
 	@$(MKDIR) `dirname $@`
-	@$(CXX) $(SYSDLL_FLAGS) $(LDFLAGS) @LDSOFLAGS@ @DBGRPATH@ -o $@ $^ $(LIBS) $(LIB3270_LIBS) $(CLASS_LIBS)
+	@$(CXX) $(DLL_FLAGS) $(LDFLAGS) @LDSOFLAGS@ @DBGRPATH@ -o $@ $^ $(LIBS) $(LIB3270_LIBS) $(CLASS_LIBS)
+
+#---[ Release Targets ]--------------------------------------------------------
+
+$(BINRLS)/$(PLUGIN_NAME): $(foreach SRC, $(basename $(PLUGIN_SRC)), $(OBJRLS)/$(SRC).o) $(BINRLS)$(DLL_NAME)
+	@echo "  CCLD `basename $@`"
+	@$(MKDIR) `dirname $@`
+	$(CXX) $(DLL_FLAGS) @LDSOFLAGS@ $(LDFLAGS) @RLS_LDFLAGS@ -o $@ $^ $(LIBS) $(LIB3270_LIBS) $(GTK_LIBS) $(GLIB_LIBS) $(PW3270_LIBS)
+
+$(BINRLS)$(DLL_NAME).$(VERSION): $(foreach SRC, $(basename $(EXTAPI_SRC)), $(OBJRLS)/$(SRC).o) $(CLASS_RELEASE_OBJECTS)
+	@echo "  CCLD `basename $@`"
+	@$(MKDIR) `dirname $@`
+	@$(CXX) $(DLL_FLAGS) @LDSOFLAGS@ $(LDFLAGS) @RLS_LDFLAGS@ -o $@ $^ $(LIBS) $(LIB3270_LIBS) $(CLASS_LIBS)
+
+install:
+	@$(MKDIR) $(DESTDIR)$(libdir)/$(PACKAGE_NAME)-plugin
+	@$(INSTALL_PROGRAM) $(BINRLS)/$(PLUGIN_NAME) $(DESTDIR)$(libdir)/$(PACKAGE_NAME)-plugins
+
+	@$(MKDIR) $(DESTDIR)$(REXXLIBDIR)
+	@$(INSTALL_PROGRAM) $(BINRLS)$(DLL_NAME).$(VERSION) $(DESTDIR)$(REXXLIBDIR)
+	@$(LN_S) @DLLPREFIX@$(MODULE_NAME)@DLLEXT@.$(VERSION) $(DESTDIR)$(REXXLIBDIR)/@DLLPREFIX@$(MODULE_NAME)@DLLEXT@
+
+	@$(MKDIR) $(DESTDIR)$(REXX_HOME)
+	@$(INSTALL_DATA) rx3270.cls $(DESTDIR)$(REXX_HOME)
...	...	@@ -5,7 +5,7 @@ msgid ""
5	5	msgstr ""
6	6	"Project-Id-Version: pw3270 5.0\n"
7	7	"Report-Msgid-Bugs-To: \n"
8		-"POT-Creation-Date: 2014-04-16 08:48-0300\n"
	8	+"POT-Creation-Date: 2014-04-23 09:34-0300\n"
9	9	"PO-Revision-Date: 2014-02-17 08:05-0300\n"
10	10	"Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
11	11	"Language-Team: Portugues <>\n"
...	...	@@ -20,7 +20,7 @@ msgstr ""
20	20	"X-Generator: Gtranslator 2.91.6\n"
21	21
22	22	#: telnet.c:1055 ssl.c:261 ssl.c:314 connect.c:98 connect.c:114 connect.c:116
23		-#: connect.c:572 connect.c:589
	23	+#: connect.c:570 connect.c:587
24	24	#, c-format
25	25	msgid "%s"
26	26	msgstr "%s"
...	...	@@ -364,7 +364,7 @@ msgstr "Tema de c_ores:"
364	364	msgid "C_onnect"
365	365	msgstr "_Conectar"
366	366
367		-#: toggles.c:313 connect.c:364 connect.c:459
	367	+#: toggles.c:313 connect.c:362 connect.c:457
368	368	#, c-format
369	369	msgid "Can't %s network keep-alive"
370	370	msgstr "Não foi possível %s opção \"keep-alive\""
...	...	@@ -374,12 +374,12 @@ msgstr "Não foi possível %s opção \"keep-alive\""
374	374	msgid "Can't accept unnamed %s"
375	375	msgstr "Não posso aceitar elemento %s sem nome"
376	376
377		-#: connect.c:106 connect.c:395
	377	+#: connect.c:106 connect.c:393
378	378	#, c-format
379	379	msgid "Can't connect to %s"
380	380	msgstr "Não foi possível conectar a %s"
381	381
382		-#: connect.c:276 connect.c:429
	382	+#: connect.c:274 connect.c:427
383	383	#, c-format
384	384	msgid "Can't connect to %s:%s"
385	385	msgstr "Não foi possível conectar a %s:%s"
...	...	@@ -481,11 +481,11 @@ msgstr "Não foi possível definir o charset do host"
481	481	msgid "Can't set lib3270 I/O handlers"
482	482	msgstr "Não foi possível registrar manipuladores de I/O 3270"
483	483
484		-#: connect.c:588
	484	+#: connect.c:586
485	485	msgid "Can't set socket to blocking mode."
486	486	msgstr "Não foi possível mudar o socket para o modo blocante."
487	487
488		-#: connect.c:588
	488	+#: connect.c:586
489	489	msgid "Can't set socket to non blocking mode"
490	490	msgstr "Não foi possível setar o socket para o modo não blocante."
491	491
...	...	@@ -608,9 +608,9 @@ msgstr "Configurar host"
608	608	msgid "Connect on startup"
609	609	msgstr "Conectar ao iniciar"
610	610
611		-#: connect.c:199 connect.c:297 connect.c:306 connect.c:368 connect.c:383
612		-#: connect.c:399 connect.c:413 connect.c:433 connect.c:447 connect.c:463
613		-#: connect.c:557
	611	+#: connect.c:199 connect.c:295 connect.c:304 connect.c:366 connect.c:381
	612	+#: connect.c:397 connect.c:411 connect.c:431 connect.c:445 connect.c:461
	613	+#: connect.c:555
614	614	msgid "Connection error"
615	615	msgstr "Erro de conexão"
616	616
...	...	@@ -1486,7 +1486,7 @@ msgstr "Erro SSL"
1486	1486	msgid "SSL Read error"
1487	1487	msgstr "Erro de leitura SSL"
1488	1488
1489		-#: connect.c:334
	1489	+#: connect.c:332
1490	1490	msgid "SSL error"
1491	1491	msgstr "Erro SSL"
1492	1492
...	...	@@ -1683,7 +1683,7 @@ msgstr "Show timer when processing"
1683	1683	msgid "Smart paste"
1684	1684	msgstr "Colar inteligente"
1685	1685
1686		-#: connect.c:570 connect.c:587
	1686	+#: connect.c:568 connect.c:585
1687	1687	msgid "Socket error"
1688	1688	msgstr "Erro no socket"
1689	1689
...	...	@@ -2003,7 +2003,7 @@ msgstr ""
2003	2003	msgid "This program requires GTK version %d.%d.%d"
2004	2004	msgstr "Este programa precisa do GTK versão %d.%d.%d"
2005	2005
2006		-#: connect.c:336
	2006	+#: connect.c:334
2007	2007	#, c-format
2008	2008	msgid ""
2009	2009	"This version of %s was built without support for secure sockets layer (SSL)."
...	...	@@ -2085,7 +2085,7 @@ msgstr "UTF-8"
2085	2085	msgid "Uknown DFT Open type from host"
2086	2086	msgstr "Host enviou código de abertura DFT desconhecido"
2087	2087
2088		-#: connect.c:335
	2088	+#: connect.c:333
2089	2089	msgid "Unable to connect to secure hosts"
2090	2090	msgstr "Não é possível conectar em servidores seguros"
2091	2091
...	...	@@ -2463,23 +2463,23 @@ msgstr "um atributo \"action\""
2463	2463	msgid "bracket"
2464	2464	msgstr "bracket"
2465	2465
2466		-#: toggles.c:313 connect.c:364 connect.c:459
	2466	+#: toggles.c:313 connect.c:362 connect.c:457
2467	2467	msgid "disable"
2468	2468	msgstr "desabilitar"
2469	2469
2470		-#: toggles.c:313 connect.c:364 connect.c:459
	2470	+#: toggles.c:313 connect.c:362 connect.c:457
2471	2471	msgid "enable"
2472	2472	msgstr "enable"
2473	2473
2474		-#: connect.c:571
	2474	+#: connect.c:569
2475	2475	msgid "fcntl() error when getting socket state."
2476	2476	msgstr "fcntl() error when getting socket state."
2477	2477
2478		-#: connect.c:384 connect.c:558
	2478	+#: connect.c:382 connect.c:556
2479	2479	msgid "ioctlsocket(FIONBIO) failed."
2480	2480	msgstr "ioctlsocket(FIONBIO) failed."
2481	2481
2482		-#: connect.c:414 connect.c:448
	2482	+#: connect.c:412 connect.c:446
2483	2483	msgid "setsockopt(SO_OOBINLINE) has failed"
2484	2484	msgstr "setsockopt(SO_OOBINLINE) has failed"
2485	2485
...	...
...	...	@@ -122,7 +122,7 @@ Release: $(BINRLS)/plugins/$(MODULE_NAME).so
122	122	$(BINRLS)/plugins/$(MODULE_NAME).so: $(foreach SRC, $(basename $(PLUGIN_SRC)), $(OBJRLS)/$(SRC).o)
123	123	@echo " CCLD `basename $@`"
124	124	@$(MKDIR) `dirname $@`
125		- $(LD) $(DLL_FLAGS) -Wl,-soname,`basename $@` $(LDFLAGS) -o $@ $^ $(LIBS) $(LIB3270_LIBS) $(PW3270_LIBS) $(GLIB_LIBS) $(GTK_LIBS) $(GDBUS_LIBS)
	125	+ @$(LD) $(DLL_FLAGS) -Wl,-soname,`basename $@` $(LDFLAGS) -o $@ $^ $(LIBS) $(LIB3270_LIBS) $(PW3270_LIBS) $(GLIB_LIBS) $(GTK_LIBS) $(GDBUS_LIBS)
126	126
127	127	$(BINRLS)/@PACKAGE_NAME@d: $(foreach SRC, $(basename $(DAEMON_SRC)), $(OBJRLS)/$(SRC).o)
128	128	@echo " CCLD `basename $@`"
...	...
...	...	@@ -47,7 +47,6 @@ LIBS=@REXX_LIBS@ @LIBICONV@ @DBUS_LIBS@
47	47	CFLAGS=@REXX_CFLAGS@ @DBUS_CFLAGS@
48	48	REXX_HOME=@REXX_HOME@
49	49	REXXLIBDIR=@REXX_LIBDIR@
50		-SYSDLL_FLAGS=@SYSDLL_FLAGS@
51	50
52	51	#---[ Debug Targets ]----------------------------------------------------------
53	52
...	...	@@ -59,5 +58,28 @@ $(BINDBG)/$(PLUGIN_NAME): $(foreach SRC, $(basename $(PLUGIN_SRC)), $(OBJDBG)/$(
59	58	$(BINDBG)$(DLL_NAME).$(VERSION): $(foreach SRC, $(basename $(EXTAPI_SRC)), $(OBJDBG)/$(SRC)@OBJEXT@) $(CLASS_DEBUG_OBJECTS)
60	59	@echo " CCLD `basename $@`"
61	60	@$(MKDIR) `dirname $@`
62		- @$(CXX) $(SYSDLL_FLAGS) $(LDFLAGS) @LDSOFLAGS@ @DBGRPATH@ -o $@ $^ $(LIBS) $(LIB3270_LIBS) $(CLASS_LIBS)
	61	+ @$(CXX) $(DLL_FLAGS) $(LDFLAGS) @LDSOFLAGS@ @DBGRPATH@ -o $@ $^ $(LIBS) $(LIB3270_LIBS) $(CLASS_LIBS)
	62	+
	63	+#---[ Release Targets ]--------------------------------------------------------
	64	+
	65	+$(BINRLS)/$(PLUGIN_NAME): $(foreach SRC, $(basename $(PLUGIN_SRC)), $(OBJRLS)/$(SRC).o) $(BINRLS)$(DLL_NAME)
	66	+ @echo " CCLD `basename $@`"
	67	+ @$(MKDIR) `dirname $@`
	68	+ $(CXX) $(DLL_FLAGS) @LDSOFLAGS@ $(LDFLAGS) @RLS_LDFLAGS@ -o $@ $^ $(LIBS) $(LIB3270_LIBS) $(GTK_LIBS) $(GLIB_LIBS) $(PW3270_LIBS)
	69	+
	70	+$(BINRLS)$(DLL_NAME).$(VERSION): $(foreach SRC, $(basename $(EXTAPI_SRC)), $(OBJRLS)/$(SRC).o) $(CLASS_RELEASE_OBJECTS)
	71	+ @echo " CCLD `basename $@`"
	72	+ @$(MKDIR) `dirname $@`
	73	+ @$(CXX) $(DLL_FLAGS) @LDSOFLAGS@ $(LDFLAGS) @RLS_LDFLAGS@ -o $@ $^ $(LIBS) $(LIB3270_LIBS) $(CLASS_LIBS)
	74	+
	75	+install:
	76	+ @$(MKDIR) $(DESTDIR)$(libdir)/$(PACKAGE_NAME)-plugin
	77	+ @$(INSTALL_PROGRAM) $(BINRLS)/$(PLUGIN_NAME) $(DESTDIR)$(libdir)/$(PACKAGE_NAME)-plugins
	78	+
	79	+ @$(MKDIR) $(DESTDIR)$(REXXLIBDIR)
	80	+ @$(INSTALL_PROGRAM) $(BINRLS)$(DLL_NAME).$(VERSION) $(DESTDIR)$(REXXLIBDIR)
	81	+ @$(LN_S) @DLLPREFIX@$(MODULE_NAME)@DLLEXT@.$(VERSION) $(DESTDIR)$(REXXLIBDIR)/@DLLPREFIX@$(MODULE_NAME)@DLLEXT@
	82	+
	83	+ @$(MKDIR) $(DESTDIR)$(REXX_HOME)
	84	+ @$(INSTALL_DATA) rx3270.cls $(DESTDIR)$(REXX_HOME)
63	85
...	...