SF.net SVN: openvrml:[3976] trunk

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

Revision: 3976
          http://openvrml.svn.sourceforge.net/openvrml/?rev=3976&view=rev
Author:   braden
Date:     2009-08-02 02:19:33 +0000 (Sun, 02 Aug 2009)

Log Message:
-----------
Moved src/libopenvrml-control to src/local/libopenvrml-control.

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

Added Paths:
-----------
    trunk/src/local/
    trunk/src/local/libopenvrml-control/

Removed Paths:
-------------
    trunk/src/libopenvrml-control/

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-08-01 08:32:26 UTC (rev 3975)
+++ trunk/ChangeLog	2009-08-02 02:19:33 UTC (rev 3976)
@@ -1,5 +1,12 @@
 2009-08-01 Braden McDaniel  <br...@en...>
 
+	Moved src/libopenvrml-control to src/local/libopenvrml-control.
+
+	* src/Makefile.am
+	* src/local/libopenvrml-control
+
+2009-08-01 Braden McDaniel  <br...@en...>
+
 	* src/script/java.cpp: Removed obsolete path separator definition.
 
 2009-07-30 Braden McDaniel  <br...@en...>

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2009-08-01 08:32:26 UTC (rev 3975)
+++ trunk/src/Makefile.am	2009-08-02 02:19:33 UTC (rev 3976)
@@ -719,7 +719,7 @@
 libopenvrml_gl_libopenvrml_gl_la_LIBADD = libopenvrml/libopenvrml.la
 
 if ENABLE_XEMBED
-noinst_LTLIBRARIES = libopenvrml-control/libopenvrml-control.la
+noinst_LTLIBRARIES = local/libopenvrml-control.la
 libexec_PROGRAMS = openvrml-xembed/openvrml-xembed
 session_bus_servicesdir = $(datadir)/dbus-1/services
 session_bus_services_DATA = openvrml-xembed/org.openvrml.BrowserControl.service
@@ -728,18 +728,18 @@
         openvrml-xembed/browser-factory-server-glue.h \
         openvrml-xembed/browser-host-client-glue.h
 endif
-libopenvrml_control_libopenvrml_control_la_SOURCES = \
-        libopenvrml-control/openvrml_control/browser.cpp \
-        libopenvrml-control/openvrml_control/browser.h
-libopenvrml_control_libopenvrml_control_la_CPPFLAGS = \
+local_libopenvrml_control_la_SOURCES = \
+        local/libopenvrml-control/openvrml_control/browser.cpp \
+        local/libopenvrml-control/openvrml_control/browser.h
+local_libopenvrml_control_la_CPPFLAGS = \
         -I$(top_builddir)/src/libopenvrml \
         -I$(top_srcdir)/src/libopenvrml
-libopenvrml_control_libopenvrml_control_la_LIBADD = \
+local_libopenvrml_control_la_LIBADD = \
         libopenvrml/libopenvrml.la
 
 openvrml_xembed_openvrml_xembed_CPPFLAGS = \
         -I$(top_builddir)/src/openvrml-xembed \
-        -I$(top_srcdir)/src/libopenvrml-control \
+        -I$(top_srcdir)/src/local/libopenvrml-control \
         -I$(top_builddir)/src/libopenvrml \
         -I$(top_srcdir)/src/libopenvrml \
         -I$(top_builddir)/src/libopenvrml-gl \
@@ -761,7 +761,7 @@
         $(DBUS_G_LIBS) \
         $(GTKGL_LIBS)
 openvrml_xembed_openvrml_xembed_LDADD = \
-        libopenvrml-control/libopenvrml-control.la \
+        local/libopenvrml-control.la \
         libopenvrml-gl/libopenvrml-gl.la
 
 openvrml_xembed_datadir = $(datadir)/openvrml-xembed


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