|
From: <br...@us...> - 2008-09-15 22:05:50
|
Revision: 3625
http://openvrml.svn.sourceforge.net/openvrml/?rev=3625&view=rev
Author: braden
Date: 2008-09-15 22:06:00 +0000 (Mon, 15 Sep 2008)
Log Message:
-----------
Made contents of BUILT_SOURCES conditional based on ENABLE_XEMBED and ENABLE_PLAYER.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/Makefile.am
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-09-15 15:19:05 UTC (rev 3624)
+++ trunk/ChangeLog 2008-09-15 22:06:00 UTC (rev 3625)
@@ -1,5 +1,10 @@
2008-09-15 Braden McDaniel <br...@en...>
+ * src/Makefile.am: Made contents of BUILT_SOURCES conditional
+ based on ENABLE_XEMBED and ENABLE_PLAYER.
+
+2008-09-15 Braden McDaniel <br...@en...>
+
Put the VRML97 node implementations into a convenience library for
now.
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2008-09-15 15:19:05 UTC (rev 3624)
+++ trunk/src/Makefile.am 2008-09-15 22:06:00 UTC (rev 3625)
@@ -1,20 +1,13 @@
SUBDIRS = script
+BUILT_SOURCES =
+
lib_LTLIBRARIES = libopenvrml/libopenvrml.la
noinst_LTLIBRARIES = node/vrml97/libvrml97.la
if ENABLE_GL_RENDERER
lib_LTLIBRARIES += libopenvrml-gl/libopenvrml-gl.la
endif
-if ENABLE_XEMBED
-libexec_PROGRAMS = openvrml-xembed/openvrml-xembed
-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 \
libopenvrml/openvrml-common.h
@@ -322,6 +315,14 @@
$(FREETYPE_LIBS) \
$(PTHREAD_LIBS)
+if ENABLE_XEMBED
+libexec_PROGRAMS = openvrml-xembed/openvrml-xembed
+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
+
libopenvrml_gl_libopenvrml_gl_la_CPPFLAGS = \
-I$(top_builddir)/src/libopenvrml \
-I$(top_srcdir)/src/libopenvrml \
@@ -376,11 +377,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 \
@@ -395,6 +391,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.
|