Download as
Browse Code »

Commit 31723167ba30edf95cfac70c5857ae8334ca17b0

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

Removendo dependência da glib-dbus na biblioteca de classes

Showing 5 changed files with 25 additions and 12 deletions   Show diff stats
@@ -366,10 +366,14 @@ AC_SUBST(GLIB_CFLAGS) @@ -366,10 +366,14 @@ AC_SUBST(GLIB_CFLAGS)
366 366
367 #--[ Check DBUS ]--------------------------------------------------------------------------------------------------------------------------------------------- 367 #--[ Check DBUS ]---------------------------------------------------------------------------------------------------------------------------------------------
368 368
369 -PKG_CHECK_MODULES( [DBUS], [dbus-glib-1], app_cv_dbus=yes, AC_MSG_NOTICE([No DBUS support.]) ) 369 +PKG_CHECK_MODULES( [DBUS], [dbus-1] )
370 AC_SUBST(DBUS_LIBS) 370 AC_SUBST(DBUS_LIBS)
371 AC_SUBST(DBUS_CFLAGS) 371 AC_SUBST(DBUS_CFLAGS)
372 372
  373 +PKG_CHECK_MODULES( [GDBUS], [dbus-glib-1], app_cv_dbus=yes, AC_MSG_NOTICE([No GDBUS support.]) )
  374 +AC_SUBST(GDBUS_LIBS)
  375 +AC_SUBST(GDBUS_CFLAGS)
  376 +
373 if test "$app_cv_dbus" == "yes"; then 377 if test "$app_cv_dbus" == "yes"; then
374 AC_DEFINE(HAVE_DBUS) 378 AC_DEFINE(HAVE_DBUS)
375 PLUGINS="$PLUGINS dbus3270" 379 PLUGINS="$PLUGINS dbus3270"
@@ -264,6 +264,15 @@ @@ -264,6 +264,15 @@
264 <Unit filename="src/oxt/pw3270.idl" /> 264 <Unit filename="src/oxt/pw3270.idl" />
265 <Unit filename="src/oxt/set.cxx" /> 265 <Unit filename="src/oxt/set.cxx" />
266 <Unit filename="src/oxt/testprogram.cxx" /> 266 <Unit filename="src/oxt/testprogram.cxx" />
  267 + <Unit filename="src/php/Makefile.in" />
  268 + <Unit filename="src/php/get.cc" />
  269 + <Unit filename="src/php/init.cc" />
  270 + <Unit filename="src/php/main.cc" />
  271 + <Unit filename="src/php/misc.cc" />
  272 + <Unit filename="src/php/php.ini" />
  273 + <Unit filename="src/php/php3270.h" />
  274 + <Unit filename="src/php/sample.php" />
  275 + <Unit filename="src/php/set.cc" />
267 <Unit filename="src/plugins/dbus3270/Makefile.in" /> 276 <Unit filename="src/plugins/dbus3270/Makefile.in" />
268 <Unit filename="src/plugins/dbus3270/daemon.c"> 277 <Unit filename="src/plugins/dbus3270/daemon.c">
269 <Option compilerVar="CC" /> 278 <Option compilerVar="CC" />
src/classlib/class.mak.in
  Diff comments   View file @3172316
@@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
24 # erico.mendonca@gmail.com (Erico Mascarenhas de Mendonça) 24 # erico.mendonca@gmail.com (Erico Mascarenhas de Mendonça)
25 # 25 #
26 26
27 -CLASS_CFLAGS=@CFLAGS@ @DLL_CFLAGS@ @DBUS_CFLAGS@ @GTK_CFLAGS@ 27 +CLASS_CFLAGS=@CFLAGS@ @DLL_CFLAGS@ @DBUS_CFLAGS@
28 CLASS_LIBS=@LIBICONV@ @DBUS_LIBS@ 28 CLASS_LIBS=@LIBICONV@ @DBUS_LIBS@
29 29
30 CLASS_SRC=session.cc exception.cc local.cc remote.cc 30 CLASS_SRC=session.cc exception.cc local.cc remote.cc
src/php/Makefile.in
  Diff comments   View file @3172316
@@ -90,7 +90,7 @@ $(BINRLS)/php3270@DLLEXT@: $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SR @@ -90,7 +90,7 @@ $(BINRLS)/php3270@DLLEXT@: $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SR
90 $(CLASS_RELEASE_OBJECTS) 90 $(CLASS_RELEASE_OBJECTS)
91 @echo " LD `basename $@`" 91 @echo " LD `basename $@`"
92 @$(MKDIR) `dirname $@` 92 @$(MKDIR) `dirname $@`
93 - @$(CXX) -shared $(LDFLAGS) $(OO_LDFLAGS) $(CLASS_LIBS) -o $@ $^ 93 + @$(CXX) @SYSDLL_FLAGS@ $(LDFLAGS) $(OO_LDFLAGS) $(CLASS_LIBS) -o $@ $^
94 94
95 95
96 #---[ Debug targets ]---------------------------------------------------------- 96 #---[ Debug targets ]----------------------------------------------------------
@@ -101,7 +101,7 @@ $(BINDBG)/php3270@DLLEXT@: $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SR @@ -101,7 +101,7 @@ $(BINDBG)/php3270@DLLEXT@: $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SR
101 $(CLASS_DEBUG_OBJECTS) 101 $(CLASS_DEBUG_OBJECTS)
102 @echo " LD `basename $@`" 102 @echo " LD `basename $@`"
103 @$(MKDIR) `dirname $@` 103 @$(MKDIR) `dirname $@`
104 - $(CXX) -shared $(LDFLAGS) $(OO_LDFLAGS) $(CLASS_LIBS) -o $@ $^ 104 + @$(CXX) @SYSDLL_FLAGS@ $(LDFLAGS) $(OO_LDFLAGS) $(CLASS_LIBS) -o $@ $^
105 105
106 106
107 run: $(BINDBG)/php3270@DLLEXT@ 107 run: $(BINDBG)/php3270@DLLEXT@
src/plugins/dbus3270/Makefile.in
  Diff comments   View file @3172316
@@ -73,11 +73,11 @@ DLL_FLAGS=-shared @@ -73,11 +73,11 @@ DLL_FLAGS=-shared
73 DLL_CFLAGS=@DLL_CFLAGS@ 73 DLL_CFLAGS=@DLL_CFLAGS@
74 DEBUG_CFLAGS=-DDEBUG=1 -g -Wall 74 DEBUG_CFLAGS=-DDEBUG=1 -g -Wall
75 75
76 -DBUS_CFLAGS=@DBUS_CFLAGS@ 76 +GDBUS_CFLAGS=@GDBUS_CFLAGS@
77 GLIB_CFLAGS=@GLIB_CFLAGS@ 77 GLIB_CFLAGS=@GLIB_CFLAGS@
78 GTK_CFLAGS=@GTK_CFLAGS@ 78 GTK_CFLAGS=@GTK_CFLAGS@
79 79
80 -DBUS_LIBS=@DBUS_LIBS@ 80 +GDBUS_LIBS=@GDBUS_LIBS@
81 GLIB_LIBS=@GLIB_LIBS@ 81 GLIB_LIBS=@GLIB_LIBS@
82 GTK_LIBS=@GTK_LIBS@ 82 GTK_LIBS=@GTK_LIBS@
83 83
@@ -107,12 +107,12 @@ endif @@ -107,12 +107,12 @@ endif
107 $(OBJDBG)/%.o: %.c $(DEPENDS) 107 $(OBJDBG)/%.o: %.c $(DEPENDS)
108 @echo " CC `basename $@`" 108 @echo " CC `basename $@`"
109 @$(MKDIR) `dirname $@` 109 @$(MKDIR) `dirname $@`
110 - @$(CC) $(CFLAGS) $(DLL_CFLAGS) $(DBUS_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS) $(DEBUG_CFLAGS) $(LIB3270_CFLAGS) $(PW3270_CFLAGS) -o $@ -c $< 110 + @$(CC) $(CFLAGS) $(DLL_CFLAGS) $(GDBUS_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS) $(DEBUG_CFLAGS) $(LIB3270_CFLAGS) $(PW3270_CFLAGS) -o $@ -c $<
111 111
112 $(OBJRLS)/%.o: %.c $(DEPENDS) 112 $(OBJRLS)/%.o: %.c $(DEPENDS)
113 @echo " CC `basename $@`" 113 @echo " CC `basename $@`"
114 @$(MKDIR) `dirname $@` 114 @$(MKDIR) `dirname $@`
115 - @$(CC) $(CFLAGS) $(DLL_CFLAGS) $(DBUS_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS) $(LIB3270_CFLAGS) $(PW3270_CFLAGS) -o $@ -c $< 115 + @$(CC) $(CFLAGS) $(DLL_CFLAGS) $(GDBUS_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS) $(LIB3270_CFLAGS) $(PW3270_CFLAGS) -o $@ -c $<
116 116
117 117
118 #---[ Release targets ]-------------------------------------------------------- 118 #---[ Release targets ]--------------------------------------------------------
@@ -122,12 +122,12 @@ Release: $(BINRLS)/plugins/$(MODULE_NAME).so @@ -122,12 +122,12 @@ Release: $(BINRLS)/plugins/$(MODULE_NAME).so
122 $(BINRLS)/plugins/$(MODULE_NAME).so: $(foreach SRC, $(basename $(PLUGIN_SRC)), $(OBJRLS)/$(SRC).o) 122 $(BINRLS)/plugins/$(MODULE_NAME).so: $(foreach SRC, $(basename $(PLUGIN_SRC)), $(OBJRLS)/$(SRC).o)
123 @echo " CCLD `basename $@`" 123 @echo " CCLD `basename $@`"
124 @$(MKDIR) `dirname $@` 124 @$(MKDIR) `dirname $@`
125 - $(LD) $(DLL_FLAGS) -Wl,-soname,`basename $@` $(LDFLAGS) -o $@ $^ $(LIBS) $(LIB3270_LIBS) $(PW3270_LIBS) $(GLIB_LIBS) $(GTK_LIBS) $(DBUS_LIBS) 125 + $(LD) $(DLL_FLAGS) -Wl,-soname,`basename $@` $(LDFLAGS) -o $@ $^ $(LIBS) $(LIB3270_LIBS) $(PW3270_LIBS) $(GLIB_LIBS) $(GTK_LIBS) $(GDBUS_LIBS)
126 126
127 $(BINRLS)/@PACKAGE_NAME@d: $(foreach SRC, $(basename $(DAEMON_SRC)), $(OBJRLS)/$(SRC).o) 127 $(BINRLS)/@PACKAGE_NAME@d: $(foreach SRC, $(basename $(DAEMON_SRC)), $(OBJRLS)/$(SRC).o)
128 @echo " CCLD `basename $@`" 128 @echo " CCLD `basename $@`"
129 @$(MKDIR) `dirname $@` 129 @$(MKDIR) `dirname $@`
130 - @$(CC) $(CFLAGS) -o $@ $^ $(DBUS_LIBS) $(GLIB_LIBS) $(LIB3270_LIBS) 130 + @$(CC) $(CFLAGS) -o $@ $^ $(GDBUS_LIBS) $(GLIB_LIBS) $(LIB3270_LIBS)
131 131
132 #---[ Debug targets ]---------------------------------------------------------- 132 #---[ Debug targets ]----------------------------------------------------------
133 133
@@ -136,7 +136,7 @@ Debug: $(BINDBG)/plugins/$(MODULE_NAME).so @@ -136,7 +136,7 @@ Debug: $(BINDBG)/plugins/$(MODULE_NAME).so
136 $(BINDBG)/plugins/$(MODULE_NAME).so: $(foreach SRC, $(basename $(PLUGIN_SRC)), $(OBJDBG)/$(SRC).o) 136 $(BINDBG)/plugins/$(MODULE_NAME).so: $(foreach SRC, $(basename $(PLUGIN_SRC)), $(OBJDBG)/$(SRC).o)
137 @echo " CCLD `basename $@`" 137 @echo " CCLD `basename $@`"
138 @$(MKDIR) `dirname $@` 138 @$(MKDIR) `dirname $@`
139 - @$(LD) $(DLL_FLAGS) @DBGRPATH@ -Wl,-soname,`basename $@` $(LDFLAGS) -o $@ $^ $(LIBS) $(LIB3270_LIBS) $(PW3270_LIBS) $(GLIB_LIBS) $(GTK_LIBS) $(DBUS_LIBS) 139 + @$(LD) $(DLL_FLAGS) @DBGRPATH@ -Wl,-soname,`basename $@` $(LDFLAGS) -o $@ $^ $(LIBS) $(LIB3270_LIBS) $(PW3270_LIBS) $(GLIB_LIBS) $(GTK_LIBS) $(GDBUS_LIBS)
140 140
141 #---[ Misc targets ]----------------------------------------------------------- 141 #---[ Misc targets ]-----------------------------------------------------------
142 142
@@ -153,7 +153,7 @@ dbus-glue.h: pw3270dbus.xml @@ -153,7 +153,7 @@ dbus-glue.h: pw3270dbus.xml
153 $(BINDBG)/@PACKAGE_NAME@d: $(foreach SRC, $(basename $(DAEMON_SRC)), $(OBJDBG)/$(SRC).o) 153 $(BINDBG)/@PACKAGE_NAME@d: $(foreach SRC, $(basename $(DAEMON_SRC)), $(OBJDBG)/$(SRC).o)
154 @echo " CCLD `basename $@`" 154 @echo " CCLD `basename $@`"
155 @$(MKDIR) `dirname $@` 155 @$(MKDIR) `dirname $@`
156 - @$(CC) $(CFLAGS) -o $@ $^ $(DBUS_LIBS) $(GLIB_LIBS) $(LIB3270_LIBS) 156 + @$(CC) $(CFLAGS) -o $@ $^ $(GDBUS_LIBS) $(GLIB_LIBS) $(LIB3270_LIBS)
157 157
158 cleandebug-service: clean 158 cleandebug-service: clean
159 159