remove STANDALONE_IMAGE_LIB define. We always built with it by default.

General makefile cleanup to make configuring easier.

client.mak

@@ -25,7 +25,6 @@ MOZ_TOP=mozilla
 #                              tree by default)
 
 MODULAR_NETLIB = 1
-STANDALONE_IMAGE_LIB = 1
 NGLAYOUT_PLUGINS = 1
 
 #

config/config.mak

@@ -151,10 +151,6 @@ CFLAGS = $(CFLAGS) -FR
 #//
 #//-----------------------------------------------------------------------
 
-!ifdef STANDALONE_IMAGE_LIB
-CFLAGS=$(CFLAGS) -DSTANDALONE_IMAGE_LIB
-!endif
-
 # Crash-reporting system.  http://www.fullcirclesoftware.com
 !ifdef MOZ_FULLCIRCLE
 CFLAGS=$(CFLAGS) -DMOZ_FULLCIRCLE

modules/libimg/makefile.win

@@ -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
@@ -15,13 +14,8 @@
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
 
-#
-
 DEPTH=..\.. 
-!ifdef STANDALONE_IMAGE_LIB
+
 DIRS = public src public_com png pngcom jpgcom gifcom
-!else
-DIRS = png classes public src
-!endif
 
 !include $(DEPTH)\config\rules.mak

modules/libutil/src/makefile.win

@@ -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
@@ -16,21 +15,14 @@
 # Reserved.
 
 
-# 
-
 MODULE=util 
 DEPTH=..\..\.. 
 CSRCS=obs.c 
 REQUIRES=nspr util 
 LIBRARY_NAME=util 
 C_OBJS=.\$(OBJDIR)\obs.obj 
-!if "$(MOZ_BITS)" != "16"
-LINCS=-I$(XPDIST)\public\nspr -I$(XPDIST)\public\util 
-!endif
 
 !include $(DEPTH)\config\rules.mak
 
-!ifdef STANDALONE_IMAGE_LIB
 install::  $(LIBRARY)
 	$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib\
-!endif

modules/libutil/src/obs.c

@@ -27,11 +27,7 @@
 #include "prclist.h"
 #include "prtypes.h"
 
-#ifdef STANDALONE_IMAGE_LIB
 #define MK_OUT_OF_MEMORY -1
-#else
-extern int MK_OUT_OF_MEMORY;
-#endif /* STANDALONE_IMAGE_LIB */
 
 typedef struct Observer
 {

network/protocol/about/mkabout.c

@@ -28,9 +28,6 @@
 #include "xplocale.h"
 #include "prefapi.h"
 #include "secnav.h"
-#ifndef STANDALONE_IMAGE_LIB
-#include "libimg.h"
-#endif
 #include "il_strm.h"
 #include "cookies.h"
 #include "httpauth.h"