aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@src.gnome.org>2007-09-13 20:56:15 +0800
committerChristian Persch <chpe@src.gnome.org>2007-09-13 20:56:15 +0800
commit0d23d7861fb49507256d67ea6fbf3e0d9701626d (patch)
tree8a500c2288a34a3d9a0bd0711288bcc5082157b8
parent7318b742df4c762c07c2d96e290481f96e743a37 (diff)
downloadgsoc2013-epiphany-0d23d7861fb49507256d67ea6fbf3e0d9701626d.tar
gsoc2013-epiphany-0d23d7861fb49507256d67ea6fbf3e0d9701626d.tar.gz
gsoc2013-epiphany-0d23d7861fb49507256d67ea6fbf3e0d9701626d.tar.bz2
gsoc2013-epiphany-0d23d7861fb49507256d67ea6fbf3e0d9701626d.tar.lz
gsoc2013-epiphany-0d23d7861fb49507256d67ea6fbf3e0d9701626d.tar.xz
gsoc2013-epiphany-0d23d7861fb49507256d67ea6fbf3e0d9701626d.tar.zst
gsoc2013-epiphany-0d23d7861fb49507256d67ea6fbf3e0d9701626d.zip
Build libgnomegeckoembed.la as noinst_LTLIBRARIES for now.
svn path=/trunk/; revision=7418
-rw-r--r--embed/xulrunner/embed/Makefile.am2
-rw-r--r--embed/xulrunner/src/Makefile.am12
2 files changed, 7 insertions, 7 deletions
diff --git a/embed/xulrunner/embed/Makefile.am b/embed/xulrunner/embed/Makefile.am
index f72419326..5158bd45a 100644
--- a/embed/xulrunner/embed/Makefile.am
+++ b/embed/xulrunner/embed/Makefile.am
@@ -117,4 +117,4 @@ libephyxulrunnerembed_la_CXXFLAGS = \
$(AM_CXXFLAGS)
libephyxulrunnerembed_la_LIBADD = \
- $(top_builddir)/embed/xulrunner/src/libgnomegeckoembed-0.0.la
+ $(top_builddir)/embed/xulrunner/src/libgnomegeckoembed.la
diff --git a/embed/xulrunner/src/Makefile.am b/embed/xulrunner/src/Makefile.am
index 2d4ac9ed3..a0d82d551 100644
--- a/embed/xulrunner/src/Makefile.am
+++ b/embed/xulrunner/src/Makefile.am
@@ -58,9 +58,9 @@ stamp-gecko-embed-type-builtins.h: Makefile $(TYPES_H_FILES)
&& rm -f xgen-$(@F) \
&& echo timestamp > $(@F)
-lib_LTLIBRARIES = libgnomegeckoembed-0.0.la
+noinst_LTLIBRARIES = libgnomegeckoembed.la
-libgnomegeckoembed_0_0_la_SOURCES = \
+libgnomegeckoembed_la_SOURCES = \
$(MARSHALERS) \
$(TYPES_SOURCES) \
gecko-dom-event.cpp \
@@ -103,7 +103,7 @@ libgnomegeckoembed_0_0_la_SOURCES = \
GeckoUtils.h \
$(NULL)
-libgnomegeckoembed_0_0_la_CPPFLAGS = \
+libgnomegeckoembed_la_CPPFLAGS = \
$(LIBXUL_CXXCPPFLAGS) \
$(LIBXUL_INCLUDES) \
$(AM_CPPFLAGS)
@@ -112,15 +112,15 @@ libgnomegeckoembed_0_0_la_CPPFLAGS = \
# -DXPCOM_GLUE
#-DMOZILLA_STRICT_API
-libgnomegeckoembed_0_0_la_CXXFLAGS = \
+libgnomegeckoembed_la_CXXFLAGS = \
$(LIBXUL_CXXFLAGS) \
$(GTK_CFLAGS) \
$(AM_CXXFLAGS)
-libgnomegeckoembed_0_0_la_LDFLAGS = \
+libgnomegeckoembed_la_LDFLAGS = \
$(AM_LDFLAGS)
-libgnomegeckoembed_0_0_la_LIBADD = \
+libgnomegeckoembed_la_LIBADD = \
$(LIBXUL_LIBS)
gnomegeckoembedincludedir = $(includedir)/gnome-gecko-embed-0.0