Download as
Browse Code »

Commit 42f2fb77798d9cff6cd35028ff73357c85e8dc48

Authored by perry.werneck@gmail.com
1 parent 3e599ae1
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Iniciando incorporação do plugin dbus ao projeto principal

Showing 3 changed files with 52 additions and 5 deletions   Show diff stats
@@ -315,6 +315,7 @@ clean: @@ -315,6 +315,7 @@ clean:
315 @make -C src/tools clean 315 @make -C src/tools clean
316 @make -C src/plugins/remotectl clean 316 @make -C src/plugins/remotectl clean
317 @make -C src/plugins/rx3270 clean 317 @make -C src/plugins/rx3270 clean
  318 + @make -C src/plugins/dbus3270 clean
318 @rm -f $(PACKAGE_NAME).png 319 @rm -f $(PACKAGE_NAME).png
319 @rm -f $(PACKAGE_NAME)-logo.png 320 @rm -f $(PACKAGE_NAME)-logo.png
320 @rm -f *.log 321 @rm -f *.log
@@ -353,3 +354,8 @@ $(BINDIR)/Debug/plugins/rx3270@DLLEXT@: src/plugins/rx3270/* $(BINDIR)/Debug/$(P @@ -353,3 +354,8 @@ $(BINDIR)/Debug/plugins/rx3270@DLLEXT@: src/plugins/rx3270/* $(BINDIR)/Debug/$(P
353 $(BINDIR)/Release/plugins/rx3270@DLLEXT@: src/plugins/rx3270/* $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) 354 $(BINDIR)/Release/plugins/rx3270@DLLEXT@: src/plugins/rx3270/* $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT)
354 @make BINDIR="../../../$(BINDIR)" LIB3270_MODE=Release -C $(dir $<) Release 355 @make BINDIR="../../../$(BINDIR)" LIB3270_MODE=Release -C $(dir $<) Release
355 356
  357 +$(BINDIR)/Debug/plugins/dbus3270@DLLEXT@: src/plugins/dbus3270/* $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT)
  358 + @make BINDIR="../../../$(BINDIR)" LIB3270_MODE=Debug -C $(dir $<) Debug
  359 +
  360 +$(BINDIR)/Release/plugins/dbus3270@DLLEXT@: src/plugins/dbus3270/* $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT)
  361 + @make BINDIR="../../../$(BINDIR)" LIB3270_MODE=Release -C $(dir $<) Release
@@ -220,7 +220,6 @@ @@ -220,7 +220,6 @@
220 <Unit filename="src/lib3270/winversc.h" /> 220 <Unit filename="src/lib3270/winversc.h" />
221 <Unit filename="src/lib3270/xioc.h" /> 221 <Unit filename="src/lib3270/xioc.h" />
222 <Unit filename="src/lib3270/xl.h" /> 222 <Unit filename="src/lib3270/xl.h" />
223 - <Unit filename="src/plugins/dbus/Makefile.in" />  
224 <Unit filename="src/plugins/dbus/daemon.c"> 223 <Unit filename="src/plugins/dbus/daemon.c">
225 <Option compilerVar="CC" /> 224 <Option compilerVar="CC" />
226 </Unit> 225 </Unit>
@@ -230,9 +229,29 @@ @@ -230,9 +229,29 @@
230 <Unit filename="src/plugins/dbus/main.c"> 229 <Unit filename="src/plugins/dbus/main.c">
231 <Option compilerVar="CC" /> 230 <Option compilerVar="CC" />
232 </Unit> 231 </Unit>
233 - <Unit filename="src/plugins/dbus/pw3270dbus.xml" />  
234 <Unit filename="src/plugins/dbus/service.h" /> 232 <Unit filename="src/plugins/dbus/service.h" />
235 - <Unit filename="src/plugins/dbus/test.sh" /> 233 + <Unit filename="src/plugins/dbus3270/Makefile.in" />
  234 + <Unit filename="src/plugins/dbus3270/daemon.c">
  235 + <Option compilerVar="CC" />
  236 + </Unit>
  237 + <Unit filename="src/plugins/dbus3270/daemon.h" />
  238 + <Unit filename="src/plugins/dbus3270/dbus-glue.h" />
  239 + <Unit filename="src/plugins/dbus3270/globals.h" />
  240 + <Unit filename="src/plugins/dbus3270/gobject.c">
  241 + <Option compilerVar="CC" />
  242 + </Unit>
  243 + <Unit filename="src/plugins/dbus3270/iocallback.c">
  244 + <Option compilerVar="CC" />
  245 + </Unit>
  246 + <Unit filename="src/plugins/dbus3270/main.c">
  247 + <Option compilerVar="CC" />
  248 + </Unit>
  249 + <Unit filename="src/plugins/dbus3270/misc.c">
  250 + <Option compilerVar="CC" />
  251 + </Unit>
  252 + <Unit filename="src/plugins/dbus3270/pw3270dbus.xml" />
  253 + <Unit filename="src/plugins/dbus3270/service.h" />
  254 + <Unit filename="src/plugins/dbus3270/test.sh" />
236 <Unit filename="src/plugins/remotectl/Makefile.in" /> 255 <Unit filename="src/plugins/remotectl/Makefile.in" />
237 <Unit filename="src/plugins/remotectl/hllapi.c"> 256 <Unit filename="src/plugins/remotectl/hllapi.c">
238 <Option compilerVar="CC" /> 257 <Option compilerVar="CC" />
src/plugins/dbus3270/Makefile.in
  Diff comments   View file @42f2fb7
@@ -54,20 +54,42 @@ DBUSBINDINGTOOL=@DBUSBINDINGTOOL@ @@ -54,20 +54,42 @@ DBUSBINDINGTOOL=@DBUSBINDINGTOOL@
54 54
55 #---[ Flags ]------------------------------------------------------------------ 55 #---[ Flags ]------------------------------------------------------------------
56 56
  57 +LIB3270_MODE ?= Default
  58 +
57 DLL_FLAGS=-shared 59 DLL_FLAGS=-shared
58 DLL_CFLAGS=@DLL_CFLAGS@ 60 DLL_CFLAGS=@DLL_CFLAGS@
59 DEBUG_CFLAGS=-DDEBUG=1 -g -Wall 61 DEBUG_CFLAGS=-DDEBUG=1 -g -Wall
60 62
61 -LIB3270_CFLAGS ?= `pkg-config --cflags lib3270`  
62 DBUS_CFLAGS=@DBUS_CFLAGS@ 63 DBUS_CFLAGS=@DBUS_CFLAGS@
63 GLIB_CFLAGS=@GLIB_CFLAGS@ 64 GLIB_CFLAGS=@GLIB_CFLAGS@
64 GTK_CFLAGS=@GTK_CFLAGS@ 65 GTK_CFLAGS=@GTK_CFLAGS@
65 66
66 -LIB3270_LIBS ?= `pkg-config --libs lib3270`  
67 DBUS_LIBS=@DBUS_LIBS@ 67 DBUS_LIBS=@DBUS_LIBS@
68 GLIB_LIBS=@GLIB_LIBS@ 68 GLIB_LIBS=@GLIB_LIBS@
69 GTK_LIBS=@GTK_LIBS@ 69 GTK_LIBS=@GTK_LIBS@
70 70
  71 +ifeq ($(LIB3270_MODE),Debug)
  72 + PW3270_LIBS=-L$(BINDBG)@DLLDIR@ -lpw3270
  73 + PW3270_CFLAGS=-I../../../src/include
  74 + LIB3270_LIBS=-L$(BINDBG)@DLLDIR@ -l3270
  75 + LIB270_CFLAGS=-I../../../src/include
  76 +endif
  77 +
  78 +ifeq ($(LIB3270_MODE),Release)
  79 + PW3270_LIBS=-L$(BINRLS)@DLLDIR@ -lṕw3270
  80 + PW3270_CFLAGS=-I../../../src/include
  81 + LIB3270_LIBS=-L$(BINRLS)@DLLDIR@ -l3270
  82 + LIB270_CFLAGS=-I../../../src/include
  83 +endif
  84 +
  85 +ifeq ($(LIB3270_MODE),Default)
  86 + LIB3270_LIBS ?= `pkg-config --libs lib3270`
  87 + LIB3270_CFLAGS ?= `pkg-config --cflags lib3270`
  88 + PW3270_LIBS ?= `pkg-config --libs pw3270`
  89 + PW3270_CFLAGS ?= `pkg-config --cflags pw3270`
  90 +endif
  91 +
  92 +
71 #---[ Rules ]------------------------------------------------------------------ 93 #---[ Rules ]------------------------------------------------------------------
72 94
73 $(OBJDBG)/%.o: %.c $(DEPENDS) 95 $(OBJDBG)/%.o: %.c $(DEPENDS)