SF.net SVN: openvrml:[3866] trunk

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

Revision: 3866
          http://openvrml.svn.sourceforge.net/openvrml/?rev=3866&view=rev
Author:   braden
Date:     2009-03-24 05:49:46 +0000 (Tue, 24 Mar 2009)

Log Message:
-----------
Moved Mozilla plug-in build into the big nonrecursive makefile.

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

Removed Paths:
-------------
    trunk/src/mozilla-plugin/Makefile.am

Property Changed:
----------------
    trunk/src/mozilla-plugin/

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-03-24 05:01:18 UTC (rev 3865)
+++ trunk/ChangeLog	2009-03-24 05:49:46 UTC (rev 3866)
@@ -1,5 +1,13 @@
 2009-03-24 Braden McDaniel  <br...@en...>
 
+	Moved Mozilla plug-in build into the big nonrecursive makefile.
+
+	* configure.ac: No longer emit src/mozilla-plugin/Makefile.
+	* src/Makefile.am: Build the Mozilla plug-in.
+	* src/mozilla-plugin/Makefile.am: Removed.
+
+2009-03-24 Braden McDaniel  <br...@en...>
+
 	Moved Mozilla plug-in source to src/mozilla-plugin.
 
 	* Makefile (SUBDIRS): Removed mozilla-plugin.

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2009-03-24 05:01:18 UTC (rev 3865)
+++ trunk/configure.ac	2009-03-24 05:49:46 UTC (rev 3866)
@@ -16,7 +16,6 @@
                 [src/script/java/vrml/Makefile]
                 [src/script/java/vrml/field/Makefile]
                 [src/script/java/vrml/node/Makefile]
-                [src/mozilla-plugin/Makefile]
                 [data/Makefile]
                 [examples/Makefile]
                 [tests/Makefile]

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2009-03-24 05:01:18 UTC (rev 3865)
+++ trunk/src/Makefile.am	2009-03-24 05:49:46 UTC (rev 3866)
@@ -1,4 +1,4 @@
-SUBDIRS = script mozilla-plugin
+SUBDIRS = script
 
 BUILT_SOURCES =
 
@@ -857,6 +857,48 @@
                    --output=$@                           \
                    $?
 
+mozpluginsdir = $(libdir)/mozilla/plugins
+if ENABLE_MOZILLA_PLUGIN
+mozplugins_LTLIBRARIES = mozilla-plugin/openvrml.la
+BUILT_SOURCES += \
+        mozilla-plugin/browser-host-server-glue.h \
+        mozilla-plugin/browser-factory-client-glue.h \
+        mozilla-plugin/browser-client-glue.h
+endif
+
+mozilla_plugin_openvrml_la_CPPFLAGS = \
+        -DMOZ_X11 \
+        -DGTK_DISABLE_DEPRECATED \
+        -DOPENVRML_LIBEXECDIR_=\"$(libexecdir)\" \
+        -Imozilla-plugin
+mozilla_plugin_openvrml_la_CXXFLAGS = \
+        $(MOZILLA_PLUGIN_CFLAGS) \
+        $(DBUS_G_CFLAGS)
+mozilla_plugin_openvrml_la_SOURCES = mozilla-plugin/openvrml.cpp
+mozilla_plugin_openvrml_la_LDFLAGS = \
+        -module -avoid-version \
+        $(MOZILLA_PLUGIN_LIBS) \
+        $(DBUS_G_LIBS)
+
+mozilla-plugin/browser-host-server-glue.h: $(srcdir)/openvrml-xembed/browser-host.xml
+	$(LIBTOOL) --mode=execute $(DBUS_BINDING_TOOL) \
+                   --prefix=openvrml_np_browser_host   \
+                   --mode=glib-server                  \
+                   --output=$@                         \
+                   $?
+
+mozilla-plugin/browser-factory-client-glue.h: $(srcdir)/openvrml-xembed/browser-factory.xml
+	$(LIBTOOL) --mode=execute $(DBUS_BINDING_TOOL) \
+                   --mode=glib-client                  \
+                   --output=$@                         \
+                   $?
+
+mozilla-plugin/browser-client-glue.h: $(srcdir)/openvrml-xembed/browser.xml
+	$(LIBTOOL) --mode=execute $(DBUS_BINDING_TOOL) \
+                   --mode=glib-client                  \
+                   --output=$@                         \
+                   $?
+
 EXTRA_DIST = \
         libopenvrml/openvrml-config.h.in \
         libopenvrml-gl/openvrml-gl-config.h.in \


Property changes on: trunk/src/mozilla-plugin
___________________________________________________________________
Deleted: svn:ignore
   - Makefile.in


Deleted: trunk/src/mozilla-plugin/Makefile.am
===================================================================
--- trunk/src/mozilla-plugin/Makefile.am	2009-03-24 05:01:18 UTC (rev 3865)
+++ trunk/src/mozilla-plugin/Makefile.am	2009-03-24 05:49:46 UTC (rev 3866)
@@ -1,44 +0,0 @@
-AM_CPPFLAGS = \
-        -DMOZ_X11 \
-        -DGTK_DISABLE_DEPRECATED \
-        -DOPENVRML_LIBEXECDIR_=\"$(libexecdir)\"
-AM_CXXFLAGS = $(MOZILLA_PLUGIN_CFLAGS) $(DBUS_G_CFLAGS)
-
-mozpluginsdir = $(libdir)/mozilla/plugins
-
-if ENABLE_MOZILLA_PLUGIN
-mozplugins_LTLIBRARIES = openvrml.la
-BUILT_SOURCES = \
-        browser-host-server-glue.h \
-        browser-factory-client-glue.h \
-        browser-client-glue.h
-endif
-
-openvrml_la_SOURCES = openvrml.cpp
-openvrml_la_LDFLAGS = \
-        -module -avoid-version \
-        $(MOZILLA_PLUGIN_LIBS) \
-        $(DBUS_G_LIBS)
-
-browser-host-server-glue.h: $(srcdir)/../openvrml-xembed/browser-host.xml
-	$(LIBTOOL) --mode=execute $(DBUS_BINDING_TOOL) \
-                   --prefix=openvrml_np_browser_host   \
-                   --mode=glib-server                  \
-                   --output=$@                         \
-                   $?
-
-browser-factory-client-glue.h: $(srcdir)/../openvrml-xembed/browser-factory.xml
-	$(LIBTOOL) --mode=execute $(DBUS_BINDING_TOOL) \
-                   --mode=glib-client                  \
-                   --output=$@                         \
-                   $?
-
-browser-client-glue.h: $(srcdir)/../openvrml-xembed/browser.xml
-	$(LIBTOOL) --mode=execute $(DBUS_BINDING_TOOL) \
-                   --mode=glib-client                  \
-                   --output=$@                         \
-                   $?
-
-EXTRA_DIST = $(openvrml_la_SOURCES)
-
-CLEANFILES = $(BUILT_SOURCES)


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