Bug 321173 - Always build javaxpcom into the mini-libxul - r=jhpedemonte

extensions/java/xpcom/src/Makefile.in

@@ -45,10 +45,10 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= javaxpcom
 LIBRARY_NAME	= javaxpcom
 LIBXUL_LIBRARY	= 1
+FORCE_STATIC_LIB = 1
 
-# On Mac OS X, JNI libraries must end with a '.jnilib' extension
-ifeq ($(OS_ARCH),Darwin)
-DLL_SUFFIX = .jnilib
+ifndef MOZ_ENABLE_LIBXUL
+DEFINES += -DIMPL_XREAPI
 endif
 
 REQUIRES	= xpcom \
@@ -86,12 +86,6 @@ endif
 # necessary until we do 'cvs move' to put files in correct directories
 LOCAL_INCLUDES += -I$(srcdir)
 
-EXTRA_DSO_LDOPTS = \
-	$(LIBS_DIR) \
-	$(EXTRA_DSO_LIBS) \
-	$(MOZ_COMPONENT_LIBS) \
-	$(NULL)
-
 GARBAGE += $(JARFILE) $(JARFILE_SRC)
 GARBAGE_DIRS += _javagen org
 

toolkit/library/Makefile.in

@@ -78,6 +78,20 @@ SHARED_LIBRARY_LIBS = \
 	$(foreach component,$(COMPONENT_LIBS),$(DIST)/lib/components/$(LIB_PREFIX)$(component).$(LIB_SUFFIX)) \
 	$(NULL)
 
+ifdef MOZ_JAVAXPCOM
+LOCAL_INCLUDES += \
+		-I$(topsrcdir)/extensions/java/xpcom/src \
+		-I$(JAVA_INCLUDE_PATH) \
+		$(NULL)
+ifeq ($(OS_ARCH),WINNT)
+CPPSRCS += dlldeps-javaxpcom.cpp
+LOCAL_INCLUDES += -I$(JAVA_INCLUDE_PATH)/win32
+else
+LOCAL_INCLUDES += -I$(JAVA_INCLUDE_PATH)/linux
+endif
+STATIC_LIBS += javaxpcom
+endif
+
 ifdef MOZ_ENABLE_LIBXUL
 include $(srcdir)/libxul-config.mk
 
@@ -139,3 +153,8 @@ ifdef GNU_CXX
 DSO_LDOPTS += -Wl,--export-all-symbols
 endif
 endif # WINNT
+
+ifdef MOZ_JAVAXPCOM
+dlldeps-javaxpcom.cpp: $(topsrcdir)/extensions/java/xpcom/src/dlldeps-javaxpcom.cpp
+	$(INSTALL) $^ .
+endif

toolkit/library/libxul-config.mk

@@ -232,17 +232,3 @@ EXTRA_DSO_LIBS += macmorefiles_s
 EXTRA_DEPS += $(DIST)/lib/$(LIB_PREFIX)macmorefiles_s.$(LIB_SUFFIX)
 endif
 
-ifdef MOZ_JAVAXPCOM
-LOCAL_INCLUDES += \
-		-I$(topsrcdir)/extensions/java/xpcom/src \
-		-I$(JAVA_INCLUDE_PATH) \
-		$(NULL)
-ifeq ($(OS_ARCH),WINNT)
-CPPSRCS += dlldeps-javaxpcom.cpp
-LOCAL_INCLUDES += -I$(JAVA_INCLUDE_PATH)/win32
-else
-LOCAL_INCLUDES += -I$(JAVA_INCLUDE_PATH)/linux
-endif
-STATIC_LIBS += javaxpcom
-endif
-

toolkit/library/libxul-rules.mk

@@ -84,11 +84,3 @@ dlldeps.cpp: $(topsrcdir)/xpcom/build/dlldeps.cpp
 
 dlldeps-obs.cpp: $(topsrcdir)/xpcom/obsolete/dlldeps-obs.cpp
 	$(INSTALL) $^ .
-
-ifdef MOZ_JAVAXPCOM
-export:: dlldeps-javaxpcom.cpp
-
-dlldeps-javaxpcom.cpp: $(topsrcdir)/extensions/java/xpcom/src/dlldeps-javaxpcom.cpp
-	$(INSTALL) $^ .
-endif
-