Cleanup and fixes for OpenBSD.

git-svn-id: svn://10.0.0.236/trunk@38164 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/mailnews/addrbook/build/Makefile.in

@@ -1,4 +1,3 @@
-#!gmake
 #
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
@@ -14,39 +13,34 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
-DEPTH = ../../..
+DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 VPATH		= @srcdir@
 srcdir		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE=addrbook
-LIBRARY_NAME=addrbook
-IS_COMPONENT=1
+MODULE		= addrbook
+LIBRARY_NAME	= addrbook
+IS_COMPONENT	= 1
 
-CPPSRCS = \
-	nsAbFactory.cpp \
+CPPSRCS		= nsAbFactory.cpp
+EXPORTS		= nsAbBaseCID.h
+
+SHARED_LIBRARY_LIBS = \
+	$(DIST)/lib/libaddrbook_s.a \
+	$(DIST)/lib/librdfutil_s.a \
 	$(NULL)
 
-EXPORTS= \
-	nsAbBaseCID.h \
-	$(NULL)
-
-
-SHARED_LIBRARY_LIBS =	\
-	$(DIST)/lib/libaddrbook_s.a	\
-	$(DIST)/lib/librdfutil_s.a	\
-	$(NULL)
-
-EXTRA_DSO_LDOPTS = 	\
-	$(MKSHLIB_FORCE_ALL)	\
-	$(SHARED_LIBRARY_LIBS)	\
-	$(MKSHLIB_UNFORCE_ALL)	\
-	$(NSPR_LIBS)			\
-	-L$(DIST)/bin			\
-	-lxpcom				\
+EXTRA_DSO_LDOPTS = \
+	$(MKSHLIB_FORCE_ALL) \
+	$(SHARED_LIBRARY_LIBS) \
+	$(MKSHLIB_UNFORCE_ALL) \
+	-L$(DIST)/bin \
+	-L$(DIST)/lib \
+	-lxpcom \
 	$(NULL)
 
 include $(topsrcdir)/config/rules.mk