From b730eb2e8c18ac6df76ad7e330d02a1474811bfe Mon Sep 17 00:00:00 2001 From: "raman%netscape.com" Date: Tue, 8 Sep 1998 21:06:54 +0000 Subject: [PATCH] Added libsoftupdat.a to the link line when MOZ_SMARTUPDATE is defined. Made SmartUpdate independent of Java --- cmd/xfe/Makefile | 7 ++++++- cmd/xfe/Makefile.in | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/cmd/xfe/Makefile b/cmd/xfe/Makefile index 49800d8e1e76..c0bad80fd265 100644 --- a/cmd/xfe/Makefile +++ b/cmd/xfe/Makefile @@ -481,6 +481,12 @@ BASIC_LIBS += \ $(DIST)/lib/libjbn.a \ $(NULL) +ifdef MOZ_SMARTUPDATE +BASIC_LIBS += $(DIST)/lib/libsoftupdate.a \ + $(DIST)/lib/libprgrss.a \ + $(NULL) +endif + ifdef MOZ_SECURITY BASIC_LIBS += $(DIST)/lib/libjsl.a endif @@ -506,7 +512,6 @@ ifdef NSJVM ifdef EDITOR BASIC_LIBS += $(DIST)/lib/libedtplug.a endif -BASIC_LIBS += $(DIST)/lib/libsoftupdate.a else # !NSJVM BASIC_LIBS += \ $(DIST)/lib/libstubsj.a \ diff --git a/cmd/xfe/Makefile.in b/cmd/xfe/Makefile.in index 4af3b44598d0..a8ede233a993 100644 --- a/cmd/xfe/Makefile.in +++ b/cmd/xfe/Makefile.in @@ -494,6 +494,12 @@ BASIC_LIBS += \ $(DIST)/lib/libjbn.a \ $(NULL) +ifdef MOZ_SMARTUPDATE +BASIC_LIBS += $(DIST)/lib/libsoftupdate.a \ + $(DIST)/lib/libprgrss.a \ + $(NULL) +endif + ifdef MOZ_SECURITY BASIC_LIBS += $(DIST)/lib/libjsl.a endif @@ -519,7 +525,6 @@ ifdef NSJVM ifdef MOZ_EDITOR BASIC_LIBS += $(DIST)/lib/libedtplug.a endif -BASIC_LIBS += $(DIST)/lib/libsoftupdate.a else # !NSJVM BASIC_LIBS += \ $(DIST)/lib/libstubsj.a \