changeset in /hg/icedtea: Add Deepak's Makefile.am updates.

[Andrew John Hughes]

changeset dbbf4ab50f12 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=dbbf4ab50f12
description:
	Add Deepak's Makefile.am updates.

	2009-07-10  Deepak Bhole  <dbhole at redhat.com>

		* Makefile.am: Fix npplugin build.

diffstat:

1 file changed, 16 insertions(+), 15 deletions(-)
Makefile.am |   31 ++++++++++++++++---------------

diffs (87 lines):

diff -r b9dc9e08ed23 -r dbbf4ab50f12 Makefile.am
--- a/Makefile.am	Tue Jul 14 13:04:20 2009 -0400
+++ b/Makefile.am	Tue Aug 04 14:44:12 2009 +0100
@@ -27,6 +27,7 @@ ICEDTEAPLUGIN_TARGET = IcedTeaNPPlugin.s
 ICEDTEAPLUGIN_TARGET = IcedTeaNPPlugin.so
 PLUGIN_PATCH = patches/icedtea-liveconnect.patch
 LIVECONNECT_DIR = -C lib/rt netscape
+NPPLUGIN_DIR=$(abs_top_srcdir)/plugin/icedteanp
 JNLP_ABOUT_TARGET = extra-lib/about.jar 
 else
 if ENABLE_PLUGIN
@@ -100,7 +101,7 @@ if ENABLE_PLUGIN
 	rm -f IcedTeaPlugin.o IcedTeaPlugin.so
 endif
 if ENABLE_NPPLUGIN
-	rm -f IcedTeaNPPlugin.o IcedTeaNPPlugin.so
+	rm -f $(NPPLUGIN_DIR)/*.o $(NPPLUGIN_DIR)/IcedTeaNPPlugin.so
 endif
 if BUILD_CACAO
 	rm -rf cacao
@@ -2303,9 +2304,9 @@ stamps/patch.stamp: stamps/patch-fsg.sta
 	mv stamps/patch.stamp.tmp stamps/patch.stamp 
 
 if ENABLE_NPPLUGIN
-	cp -a $(abs_top_srcdir)/plugin/icedteanp/sun/applet/*java openjdk/jdk/src/share/classes/sun/applet/
+	cp -a $(abs_top_srcdir)/plugin/icedteanp/java/sun/applet/*java openjdk/jdk/src/share/classes/sun/applet/
 	mkdir -p rt
-	cp -a $(abs_top_srcdir)/plugin/icedteanp/netscape rt/
+	cp -a $(abs_top_srcdir)/plugin/icedteanp/java/netscape rt/
 else
 if ENABLE_PLUGIN
 	cp -a $(abs_top_srcdir)/plugin/icedtea/sun/applet/*java openjdk/jdk/src/share/classes/sun/applet/
@@ -2679,9 +2680,9 @@ stamps/icedtea.stamp: stamps/bootstrap-d
 	mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext
 	mkdir -p $(BUILD_OUTPUT_DIR)/j2re-image/lib/ext 
 if ENABLE_NPPLUGIN
-	cp -pPRf IcedTeaNPPlugin.so \
+	cp -pPRf $(NPPLUGIN_DIR)/IcedTeaNPPlugin.so \
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
-	cp -pPRf IcedTeaNPPlugin.so \
+	cp -pPRf $(NPPLUGIN_DIR)/IcedTeaNPPlugin.so \
 	  $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
 endif
 if ENABLE_PLUGIN
@@ -3229,7 +3230,7 @@ NPPLUGIN_OBJECTS=IcedTeaNPPlugin.o IcedT
 	IcedTeaPluginUtils.o
 
 IcedTeaNPPlugin_objects:
-	(cd plugin/icedteanp 
+	cd $(NPPLUGIN_DIR); \ 
 	if [ -e $(abs_top_srcdir)/.hg ] && which $(HG) >/dev/null; then \
 	  revision="-r`(cd $(abs_top_srcdir); $(HG) tip --template '{rev}')`" ; \
 	fi ; \
@@ -3242,24 +3243,24 @@ IcedTeaNPPlugin_objects:
 	  $(GLIB_CFLAGS) \
 	  $(GTK_CFLAGS) \
 	  $(MOZILLA_CFLAGS) \
-	  -fPIC -c $(NPPLUGIN_SRC)
-	  )
+	  -fPIC -c $(NPPLUGIN_SRC); \
+	cd ../
 
 IcedTeaNPPlugin.so: IcedTeaNPPlugin_objects
-	(cd plugin/icedteanp 
+	cd $(NPPLUGIN_DIR); \
 	$(CXX) $(CXXFLAGS) \
 	  $(NPPLUGIN_OBJECTS) \
 	  $(GLIB_LIBS) \
 	  $(GTK_LIBS) \
 	  $(MOZILLA_LIBS)\
-	  -shared -o $@
-	)
+	  -shared -o $@ \
+	cd ../
 
 clean-IcedTeaNPPlugin:
-	(cd plugin/icedteanp
-	rm -f $(NPPLUGIN_OBJECTS)
-	rm -f IcedTeaNPPlugin.so
-	)
+	cd $(NPPLUGIN_DIR); \
+	rm -f *.o; \
+	rm -f IcedTeaNPPlugin.so; \
+	cd ../
 endif
 if ENABLE_PLUGIN
 # IcedTeaPlugin.so.