SF.net SVN: openvrml:[4057] trunk

[<br...@us...>]

Revision: 4057
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4057&view=rev
Author:   braden
Date:     2009-11-28 06:33:34 +0000 (Sat, 28 Nov 2009)

Log Message:
-----------
Only install openvrml-player.ui if we were configured to build openvrml-player.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/Makefile.am

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-11-28 04:03:07 UTC (rev 4056)
+++ trunk/ChangeLog	2009-11-28 06:33:34 UTC (rev 4057)
@@ -1,3 +1,8 @@
+2009-11-28 Braden McDaniel  <br...@en...>
+
+	* src/Makefile.am: Only install openvrml-player.ui if we were
+	configured to build openvrml-player.
+
 2009-11-27 Braden McDaniel  <br...@en...>
 
 	* src/script/java.cpp (load_libjvm::load_libjvm()): Improved error

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2009-11-28 04:03:07 UTC (rev 4056)
+++ trunk/src/Makefile.am	2009-11-28 06:33:34 UTC (rev 4057)
@@ -814,12 +814,14 @@
 
 openvrml-xembed/org.openvrml.BrowserControl.service: $(srcdir)/openvrml-xembed/org.openvrml.BrowserControl.service.in
 
+openvrml_player_uidir = $(datadir)/openvrml-player/ui
 if ENABLE_PLAYER
 bin_PROGRAMS = openvrml-player/openvrml-player
 BUILT_SOURCES += \
         openvrml-player/browser-host-server-glue.h \
         openvrml-player/browser-factory-client-glue.h \
         openvrml-player/browser-client-glue.h
+dist_openvrml_player_ui_DATA = openvrml-player/openvrml-player.ui
 endif
 
 openvrml_player_openvrml_player_CPPFLAGS = \
@@ -843,9 +845,6 @@
         $(DBUS_G_LIBS) \
         $(CURL_LIBS)
 
-openvrml_player_uidir = $(datadir)/openvrml-player/ui
-dist_openvrml_player_ui_DATA = openvrml-player/openvrml-player.ui
-
 openvrml_player_openvrml_player_SOURCES = \
         openvrml-player/filechooserdialog.cpp \
         openvrml-player/player.cpp \


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.