Fix up the unix makefiles so it actually builds

uriloader/extprotocol/Makefile.in

@@ -26,7 +26,7 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS		= public unix base
+DIRS		= public base
 
 include $(topsrcdir)/config/rules.mk
 

uriloader/extprotocol/base/Makefile.in

@@ -41,9 +41,6 @@ SHARED_LIBRARY_LIBS = \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
-		$(MKSHLIB_FORCE_ALL) \
-		$(SHARED_LIBRARY_LIBS) \
-		$(MKSHLIB_UNFORCE_ALL) \
 		-L$(DIST)/lib	\
 		-L$(DIST)/bin \
 		$(MOZ_COMPONENT_LIBS) \
@@ -51,5 +48,5 @@ EXTRA_DSO_LDOPTS = \
 
 include $(topsrcdir)/config/rules.mk
 
-$(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile
+# $(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile
 

uriloader/extprotocol/base/nsExternalProtocol.cpp

@@ -133,3 +133,20 @@ nsresult nsExternalProtocol::LaunchViaHelper( nsIURI *pUri)
 	return( NS_ERROR_FAILURE);
 }
 
+
+
+#ifdef XP_UNIX
+// For some reason I cannot get the makefile for building the unix
+// static lib to work properly.  Rather than wastew many many hours
+// on it, just include the source here.  If anyone can figure out how
+// to get the makefile in extprotocol/unix to work then remove this
+// and add that library to the makefile in extprotocol/base - that is
+// how the windows build works
+
+#define UNIX_MAKEFILE_NO_WORKY	1
+
+#include "../unix/nsExternalProtocolUnix.cpp"
+
+#endif
+
+

uriloader/extprotocol/unix/Makefile.in

@@ -26,7 +26,7 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= extprotocol
+#MODULE		= extprotocol
 LIBRARY_NAME	= extprotocolunix_s
 
 CPPSRCS = 		nsExternalProcotolUnix.cpp 		\

uriloader/extprotocol/unix/nsExternalProtocolUnix.cpp

@@ -19,6 +19,7 @@
  *   
  */
 
+#ifndef UNIX_MAKEFILE_NO_WORKY
 
 #include "nscore.h"
 #include "nsCRT.h"
@@ -36,13 +37,14 @@
 #define DEBUG_LOG1( x, y)
 #endif
 
+#endif
 
 ////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////
 
 nsresult nsExternalProtocol::DefaultLaunch( nsIURI *pUri)
 {
-	nsresult rv = NS_ERROR_FAILURE;
+    nsresult rv = NS_ERROR_FAILURE;
 
     return( rv);
 }