Commit 31723167ba30edf95cfac70c5857ae8334ca17b0
1 parent
69598e39
Exists in
master
and in
5 other branches
Removendo dependência da glib-dbus na biblioteca de classes
Showing
5 changed files
with
25 additions
and
12 deletions
Show diff stats
configure.ac
... | ... | @@ -366,10 +366,14 @@ AC_SUBST(GLIB_CFLAGS) |
366 | 366 | |
367 | 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 | 370 | AC_SUBST(DBUS_LIBS) |
371 | 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 | 377 | if test "$app_cv_dbus" == "yes"; then |
374 | 378 | AC_DEFINE(HAVE_DBUS) |
375 | 379 | PLUGINS="$PLUGINS dbus3270" | ... | ... |
pw3270.cbp
... | ... | @@ -264,6 +264,15 @@ |
264 | 264 | <Unit filename="src/oxt/pw3270.idl" /> |
265 | 265 | <Unit filename="src/oxt/set.cxx" /> |
266 | 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 | 276 | <Unit filename="src/plugins/dbus3270/Makefile.in" /> |
268 | 277 | <Unit filename="src/plugins/dbus3270/daemon.c"> |
269 | 278 | <Option compilerVar="CC" /> | ... | ... |
src/classlib/class.mak.in
... | ... | @@ -24,7 +24,7 @@ |
24 | 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 | 28 | CLASS_LIBS=@LIBICONV@ @DBUS_LIBS@ |
29 | 29 | |
30 | 30 | CLASS_SRC=session.cc exception.cc local.cc remote.cc | ... | ... |
src/php/Makefile.in
... | ... | @@ -90,7 +90,7 @@ $(BINRLS)/php3270@DLLEXT@: $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SR |
90 | 90 | $(CLASS_RELEASE_OBJECTS) |
91 | 91 | @echo " LD `basename $@`" |
92 | 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 | 96 | #---[ Debug targets ]---------------------------------------------------------- |
... | ... | @@ -101,7 +101,7 @@ $(BINDBG)/php3270@DLLEXT@: $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SR |
101 | 101 | $(CLASS_DEBUG_OBJECTS) |
102 | 102 | @echo " LD `basename $@`" |
103 | 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 | 107 | run: $(BINDBG)/php3270@DLLEXT@ | ... | ... |
src/plugins/dbus3270/Makefile.in
... | ... | @@ -73,11 +73,11 @@ DLL_FLAGS=-shared |
73 | 73 | DLL_CFLAGS=@DLL_CFLAGS@ |
74 | 74 | DEBUG_CFLAGS=-DDEBUG=1 -g -Wall |
75 | 75 | |
76 | -DBUS_CFLAGS=@DBUS_CFLAGS@ | |
76 | +GDBUS_CFLAGS=@GDBUS_CFLAGS@ | |
77 | 77 | GLIB_CFLAGS=@GLIB_CFLAGS@ |
78 | 78 | GTK_CFLAGS=@GTK_CFLAGS@ |
79 | 79 | |
80 | -DBUS_LIBS=@DBUS_LIBS@ | |
80 | +GDBUS_LIBS=@GDBUS_LIBS@ | |
81 | 81 | GLIB_LIBS=@GLIB_LIBS@ |
82 | 82 | GTK_LIBS=@GTK_LIBS@ |
83 | 83 | |
... | ... | @@ -107,12 +107,12 @@ endif |
107 | 107 | $(OBJDBG)/%.o: %.c $(DEPENDS) |
108 | 108 | @echo " CC `basename $@`" |
109 | 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 | 112 | $(OBJRLS)/%.o: %.c $(DEPENDS) |
113 | 113 | @echo " CC `basename $@`" |
114 | 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 | 118 | #---[ Release targets ]-------------------------------------------------------- |
... | ... | @@ -122,12 +122,12 @@ 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) $(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 | 127 | $(BINRLS)/@PACKAGE_NAME@d: $(foreach SRC, $(basename $(DAEMON_SRC)), $(OBJRLS)/$(SRC).o) |
128 | 128 | @echo " CCLD `basename $@`" |
129 | 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 | 132 | #---[ Debug targets ]---------------------------------------------------------- |
133 | 133 | |
... | ... | @@ -136,7 +136,7 @@ Debug: $(BINDBG)/plugins/$(MODULE_NAME).so |
136 | 136 | $(BINDBG)/plugins/$(MODULE_NAME).so: $(foreach SRC, $(basename $(PLUGIN_SRC)), $(OBJDBG)/$(SRC).o) |
137 | 137 | @echo " CCLD `basename $@`" |
138 | 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 | 141 | #---[ Misc targets ]----------------------------------------------------------- |
142 | 142 | |
... | ... | @@ -153,7 +153,7 @@ dbus-glue.h: pw3270dbus.xml |
153 | 153 | $(BINDBG)/@PACKAGE_NAME@d: $(foreach SRC, $(basename $(DAEMON_SRC)), $(OBJDBG)/$(SRC).o) |
154 | 154 | @echo " CCLD `basename $@`" |
155 | 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 | 158 | cleandebug-service: clean |
159 | 159 | ... | ... |