From 1a74604c526d8403273f409852f5e88d0f4b03dd Mon Sep 17 00:00:00 2001
From: "cyeh%netscape.com" <cyeh%netscape.com>
Date: Thu, 2 Sep 1999 01:10:47 +0000
Subject: [PATCH] remove STANDALONE_IMAGE_LIB define. We always built with it
 by default. General makefile cleanup to make configuring easier.

---
 client.mak                       | 1 -
 config/config.mak                | 4 ----
 modules/libimg/makefile.win      | 8 +-------
 modules/libutil/src/makefile.win | 8 --------
 modules/libutil/src/obs.c        | 4 ----
 network/protocol/about/mkabout.c | 3 ---
 6 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/client.mak b/client.mak
index a5e4f74dd67..c96a93e7390 100644
--- a/client.mak
+++ b/client.mak
@@ -25,7 +25,6 @@ MOZ_TOP=mozilla
 #                              tree by default)
 
 MODULAR_NETLIB = 1
-STANDALONE_IMAGE_LIB = 1
 NGLAYOUT_PLUGINS = 1
 
 #
diff --git a/config/config.mak b/config/config.mak
index 4bc7a8bbc28..de9920e8479 100644
--- a/config/config.mak
+++ b/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
diff --git a/modules/libimg/makefile.win b/modules/libimg/makefile.win
index cab84642959..94ed55a5447 100644
--- a/modules/libimg/makefile.win
+++ b/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
diff --git a/modules/libutil/src/makefile.win b/modules/libutil/src/makefile.win
index 765705997cb..08531e9611c 100644
--- a/modules/libutil/src/makefile.win
+++ b/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
diff --git a/modules/libutil/src/obs.c b/modules/libutil/src/obs.c
index cbd97156acd..f4b4df53033 100644
--- a/modules/libutil/src/obs.c
+++ b/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
 {
diff --git a/network/protocol/about/mkabout.c b/network/protocol/about/mkabout.c
index 3556973aad2..3232c4c1429 100644
--- a/network/protocol/about/mkabout.c
+++ b/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"