Update of /cvsroot/openvrml/openvrml/src/openvrml-gtkplug
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv32518/src/openvrml-gtkplug
Modified Files:
Tag: OpenVRML-0_16-BRANCH
Makefile.am
Log Message:
Link openvrml-gtkplug using OPENVRML_RPATH (that is, an rpath to the directory where libmozjs resides).
Index: Makefile.am
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/openvrml-gtkplug/Makefile.am,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -d -r1.2.2.1 -r1.2.2.2
*** Makefile.am 1 Oct 2006 05:48:30 -0000 1.2.2.1
--- Makefile.am 2 Oct 2006 03:43:57 -0000 1.2.2.2
***************
*** 10,13 ****
--- 10,25 ----
-DGTK_DISABLE_DEPRECATED
AM_CXXFLAGS = @PTHREAD_CFLAGS@ @GTK_CFLAGS@ @GL_CFLAGS@
+ AM_LDFLAGS = \
+ @OPENVRML_RPATH@ \
+ @JNI_LIBS@ \
+ @GTK_LIBS@ \
+ @GL_LIBS@ \
+ -lXmu -lXt @X_PRE_LIBS@ @X_LIBS@ @X_EXTRA_LIBS@ \
+ -lboost_thread \
+ @PTHREAD_LIBS@
+ LDADD = $(top_builddir)/src/libopenvrml-gl/libopenvrml-gl.la \
+ $(top_builddir)/src/libopenvrml/libopenvrml.la \
+ $(top_builddir)/lib/gtkglext/gtk/libgtkglext-x11-1.0.la \
+ $(top_builddir)/lib/gtkglext/gdk/libgdkglext-x11-1.0.la
if ENABLE_GTKPLUG
***************
*** 26,40 ****
gtkvrmlbrowser.cpp \
flag.cpp
- openvrml_gtkplug_LDADD = \
- $(top_builddir)/src/libopenvrml-gl/libopenvrml-gl.la \
- $(top_builddir)/src/libopenvrml/libopenvrml.la \
- $(top_builddir)/lib/gtkglext/gtk/libgtkglext-x11-1.0.la \
- $(top_builddir)/lib/gtkglext/gdk/libgdkglext-x11-1.0.la
- openvrml_gtkplug_LDFLAGS = \
- @GTK_LIBS@ \
- @GL_LIBS@ \
- -lXmu -lXt @X_PRE_LIBS@ @X_LIBS@ @X_EXTRA_LIBS@ \
- -lboost_thread \
- @PTHREAD_LIBS@
EXTRA_DIST = $(openvrml_gtkplug_SOURCES)
--- 38,41 ----
|
