|
From: <br...@us...> - 2008-10-05 04:39:33
|
Revision: 3715
http://openvrml.svn.sourceforge.net/openvrml/?rev=3715&view=rev
Author: braden
Date: 2008-10-05 04:39:25 +0000 (Sun, 05 Oct 2008)
Log Message:
-----------
Made contents of BUILT_SOURCES conditional based on ENABLE_XEMBED and ENABLE_PLAYER.
Modified Paths:
--------------
branches/0.17/ChangeLog
branches/0.17/NEWS
branches/0.17/src/Makefile.am
Property Changed:
----------------
branches/0.17/
Property changes on: branches/0.17
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk:3596,3612,3707,3710
+ /trunk:3596,3612,3625,3707,3710
Modified: branches/0.17/ChangeLog
===================================================================
--- branches/0.17/ChangeLog 2008-10-05 04:27:46 UTC (rev 3714)
+++ branches/0.17/ChangeLog 2008-10-05 04:39:25 UTC (rev 3715)
@@ -1,3 +1,8 @@
+2008-10-05 Braden McDaniel <br...@en...>
+
+ * src/Makefile.am: Made contents of BUILT_SOURCES conditional
+ based on ENABLE_XEMBED and ENABLE_PLAYER.
+
2008-10-04 Braden McDaniel <br...@en...>
If we set the absolute path of session_bus_servicesdir, the
Modified: branches/0.17/NEWS
===================================================================
--- branches/0.17/NEWS 2008-10-05 04:27:46 UTC (rev 3714)
+++ branches/0.17/NEWS 2008-10-05 04:39:25 UTC (rev 3715)
@@ -1,3 +1,9 @@
+Changes new in version 0.17.9, ?? October, 2008
+========================================================================
+
+- Use D-Bus for communication with the OpenVRML XEmbed control.
+
+
Changes new in version 0.17.8, 13 August, 2008
========================================================================
Modified: branches/0.17/src/Makefile.am
===================================================================
--- branches/0.17/src/Makefile.am 2008-10-05 04:27:46 UTC (rev 3714)
+++ branches/0.17/src/Makefile.am 2008-10-05 04:39:25 UTC (rev 3715)
@@ -1,3 +1,5 @@
+BUILT_SOURCES =
+
lib_LTLIBRARIES = libopenvrml/libopenvrml.la
if ENABLE_GL_RENDERER
lib_LTLIBRARIES += libopenvrml-gl/libopenvrml-gl.la
@@ -3,14 +5,4 @@
endif
-if ENABLE_XEMBED
-libexec_PROGRAMS = openvrml-xembed/openvrml-xembed
-session_bus_servicesdir = $(datadir)/dbus-1/services
-session_bus_services_DATA = openvrml-xembed/org.openvrml.BrowserControl.service
-endif
-
-if ENABLE_PLAYER
-bin_PROGRAMS = openvrml-player/openvrml-player
-endif
-
pkginclude_HEADERS = \
libopenvrml/openvrml-config.h \
@@ -165,6 +157,14 @@
$(GLU_LIBS)
libopenvrml_gl_libopenvrml_gl_la_LIBADD = libopenvrml/libopenvrml.la
+if ENABLE_XEMBED
+libexec_PROGRAMS = openvrml-xembed/openvrml-xembed
+session_bus_servicesdir = $(datadir)/dbus-1/services
+session_bus_services_DATA = openvrml-xembed/org.openvrml.BrowserControl.service
+BUILT_SOURCES += \
+ openvrml-xembed/browser-server-glue.h \
+ openvrml-xembed/browser-factory-server-glue.h
+endif
openvrml_xembed_openvrml_xembed_CPPFLAGS = \
-I$(top_builddir)/src/openvrml-xembed \
-I$(top_srcdir)/lib/gtkglext \
@@ -207,11 +207,6 @@
openvrml-xembed/browser-factory.xml \
openvrml-xembed/browser-host.xml
-BUILT_SOURCES = \
- openvrml-xembed/browser-server-glue.h \
- openvrml-xembed/browser-factory-server-glue.h \
- openvrml-player/browser-host-server-glue.h
-
openvrml-xembed/browser-server-glue.h: $(srcdir)/openvrml-xembed/browser.xml
$(LIBTOOL) --mode=execute $(DBUS_BINDING_TOOL) \
--prefix=openvrml_xembed_browser \
@@ -226,6 +221,12 @@
--output=$@ \
$?
+if ENABLE_PLAYER
+bin_PROGRAMS = openvrml-player/openvrml-player
+BUILT_SOURCES += \
+ openvrml-player/browser-host-server-glue.h
+endif
+
openvrml_player_openvrml_player_CPPFLAGS = \
-DG_DISABLE_DEPRECATED \
-DGTK_DISABLE_DEPRECATED \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|