Mercurial > hg > release > icedtea6-1.8
changeset 1844:b0df194e92bb
Build NPPlugin in the correct place.
2010-01-25 Andrew John Hughes <ahughes@redhat.com>
* Makefile.am:
Build NPPlugin in the build directory,
not the source tree.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Mon, 25 Jan 2010 21:49:03 +0000 |
| parents | 36726dd810a7 |
| children | 73f992e2b417 |
| files | ChangeLog Makefile.am |
| diffstat | 2 files changed, 11 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Jan 25 21:31:04 2010 +0000 +++ b/ChangeLog Mon Jan 25 21:49:03 2010 +0000 @@ -1,3 +1,9 @@ +2010-01-25 Andrew John Hughes <ahughes@redhat.com> + + * Makefile.am: + Build NPPlugin in the build directory, + not the source tree. + 2010-01-22 Deepak Bhole <dbhole@redhat.com> * Makefile.am:
--- a/Makefile.am Mon Jan 25 21:31:04 2010 +0000 +++ b/Makefile.am Mon Jan 25 21:49:03 2010 +0000 @@ -116,7 +116,8 @@ ICEDTEAPLUGIN_TARGET = stamps/icedtea-npplugin PLUGIN_PATCH = patches/icedtea-liveconnect.patch LIVECONNECT_DIR = -C lib/rt netscape -NPPLUGIN_DIR=$(abs_top_srcdir)/plugin/icedteanp +NPPLUGIN_DIR=$(abs_top_builddir)/plugin/icedteanp +NPPLUGIN_SRCDIR=$(abs_top_srcdir)/plugin/icedteanp LIVECONNECT_SRCS = $(NPPLUGIN_DIR)/java else if ENABLE_PLUGIN @@ -1492,7 +1493,8 @@ IcedTeaJavaRequestProcessor.o IcedTeaPluginRequestProcessor.o \ IcedTeaPluginUtils.o -$(addprefix $(NPPLUGIN_DIR)/,$(NPPLUGIN_OBJECTS)): $(addprefix $(NPPLUGIN_DIR)/,$(NPPLUGIN_SRC)) +$(addprefix $(NPPLUGIN_DIR)/,$(NPPLUGIN_OBJECTS)): $(addprefix $(NPPLUGIN_SRCDIR)/,$(NPPLUGIN_SRC)) + mkdir -p $(NPPLUGIN_DIR) && \ cd $(NPPLUGIN_DIR) && \ $(CXX) $(CXXFLAGS) \ -DPLUGIN_VERSION="\"$(PLUGIN_VERSION)\"" \ @@ -1500,7 +1502,7 @@ $(GLIB_CFLAGS) \ $(GTK_CFLAGS) \ $(MOZILLA_CFLAGS) \ - -fPIC -c $(NPPLUGIN_SRC) + -fPIC -c $(addprefix $(NPPLUGIN_SRCDIR)/,$(NPPLUGIN_SRC)) $(NPPLUGIN_DIR)/IcedTeaNPPlugin.so: $(addprefix $(NPPLUGIN_DIR)/,$(NPPLUGIN_OBJECTS)) cd $(NPPLUGIN_DIR) && \