dbus/gcj/org/freedesktop/dbus Makefile.am,1.1,1.2

John Palmieri johnp at freedesktop.org
Tue Sep 6 15:38:56 PDT 2005


Update of /cvs/dbus/dbus/gcj/org/freedesktop/dbus
In directory gabe:/tmp/cvs-serv32375/gcj/org/freedesktop/dbus

Modified Files:
	Makefile.am 
Log Message:
* Released 0.50

* Patch from Steve Grubb:
- bus/activation.c (bus_activation_service_reload_test): clean up
some indentation
- dbus/dbus-keyring.c (_dbus_keyring_reload): fix conditional 
- dbus/dbus-message-factory.c (generate_special): fix a couple of
buffer overflows in the test suite.  This is non critical because
it can not be exploited and this code is only run when doing a 
make check.

* Patch from Yaakov Selkowitz: Build fixes for Cygwin
- configure.in: Don't check and link against kdecore, only qt headers
- dbus/Makefile.am: Add -no-undefined to libdbus_1_la_LDFLAGS
- gcj/org/freedesktop/dbus/Makefile.am:
add libdbus_gcj_1_la_LDFLAGS = -no-undefined
- glib/Makefile.am: Add -no-undefined to libdbus_glib_1_la_LDFLAGS
and $(DBUS_GLIB_LIBS) to dbus_binding_tool_LDADD
- qt/Makefile.am: Add -no-undefined to libdbus_qt_1_la_LDFLAGS
- tools/Makefile.am: Add platform extentions to binaries 
(i.e. .exe on windows)

* configure.in: 
- Make it so if no suitable version of python is found we only 
disable building python instead of exiting the configure script
- Require version 2.4 of glib for glib bindings
- Up version to 0.50

* python/__init__.py: Sync version with libdbus to (0,50,0)



Index: Makefile.am
===================================================================
RCS file: /cvs/dbus/dbus/gcj/org/freedesktop/dbus/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile.am	23 Jun 2003 17:39:48 -0000	1.1
+++ Makefile.am	6 Sep 2005 22:38:54 -0000	1.2
@@ -32,7 +32,7 @@
 	$(LIBTOOL) --mode=compile $(CXX) $(INCLUDES) $(CXXFLAGS) $(CPPFLAGS) -c -o '$@' '$<'
 
 .java.lo:
-	$(LIBTOOL) --mode=compile $(GCJ) $(GCJ_FLAGS) -c -o '$@' '$<'
+	$(LIBTOOL) --mode=compile $(GCJ) $(INCLUDES) $(GCJ_FLAGS) -c -o '$@' '$<'
 
 libdbus_gcj_1_la_SOURCES =
 
@@ -43,6 +43,8 @@
 	$(java_class_files)
 
 
+libdbus_gcj_1_la_LDFLAGS = -no-undefined
+
 libdbus_gcj_1_la_LIBADD = 		\
 	$(native_object_files)		\
 	$(java_object_files)
@@ -51,5 +53,5 @@
 	$(native_sources)		\
 	$(java_sources)
 
-libdbus_gcj_1_la_LINK = $(LIBTOOL) --tag=CXX --mode=link $(CXX) -L$(here) $(JC1FLAGS) $(LDFLAGS) -o $@
+libdbus_gcj_1_la_LINK = $(LIBTOOL) --tag=GCJ --mode=link $(GCJ) -L$(here) $(JC1FLAGS) $(LDFLAGS) -o $@
 



More information about the dbus-commit mailing list