From 0e85815036efc11d7d9f6032aaeaf57e68895115 Mon Sep 17 00:00:00 2001 From: "briano%netscape.com" Date: Fri, 10 Sep 1999 00:37:14 +0000 Subject: [PATCH] General cleanup. --- modules/libreg/Makefile.in | 10 ++++---- modules/plugin/samples/simple/Makefile.in | 29 +++++++++-------------- modules/plugin/src/Makefile.in | 15 ++++-------- modules/plugin/test/Makefile.in | 29 +++++++++-------------- modules/zlib/Makefile.in | 9 ++++--- 5 files changed, 36 insertions(+), 56 deletions(-) diff --git a/modules/libreg/Makefile.in b/modules/libreg/Makefile.in index bea2fa98c2b1..bb43e8af4557 100644 --- a/modules/libreg/Makefile.in +++ b/modules/libreg/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,15 +13,16 @@ # 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@ +VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = include src +DIRS = include src include $(topsrcdir)/config/rules.mk + diff --git a/modules/plugin/samples/simple/Makefile.in b/modules/plugin/samples/simple/Makefile.in index 20c5e95f7e71..8249f9343535 100644 --- a/modules/plugin/samples/simple/Makefile.in +++ b/modules/plugin/samples/simple/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,33 +13,27 @@ # Communications Corporation. Portions created by Netscape are # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. +# -DEPTH = ../../.. +DEPTH = ../../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MODULE = npsimple -LIBRARY_NAME = npsimple -IS_COMPONENT = 1 +MODULE = npsimple +LIBRARY_NAME = npsimple +IS_COMPONENT = 1 -LOCAL_INCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../public +CPPSRCS = npsimple.cpp -CPPSRCS = \ - npsimple.cpp \ - $(NULL) - -include $(topsrcdir)/config/config.mk - -CXXFLAGS += $(MOZ_TOOLKIT_REGISTRY_CFLAGS) +LOCAL_INCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../public include $(topsrcdir)/config/rules.mk -EXPORT_RESOURCE_SAMPLES := \ - $(srcdir)/samples/embed-test.html \ - $(NULL) +CXXFLAGS += $(MOZ_TOOLKIT_REGISTRY_CFLAGS) + +install:: + $(INSTALL) $(srcdir)/samples/embed-test.html $(DIST)/bin/res/samples -install:: - $(INSTALL) $(EXPORT_RESOURCE_SAMPLES) $(DIST)/bin/res/samples diff --git a/modules/plugin/src/Makefile.in b/modules/plugin/src/Makefile.in index 9c075f2e04e2..501459425285 100644 --- a/modules/plugin/src/Makefile.in +++ b/modules/plugin/src/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,6 +13,7 @@ # Communications Corporation. Portions created by Netscape are # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. +# DEPTH = ../../.. topsrcdir = @top_srcdir@ @@ -25,27 +25,22 @@ include $(DEPTH)/config/autoconf.mk MODULE = plugimpl LIBRARY_NAME = plug +REQUIRES = lay layer js style applet img util java pref xpcom raptor netcnvts plugin plugimpl oji ojiimpl caps + CSRCS = npassoc.c CPPSRCS = nsplugin.cpp npglue.cpp nsMalloc.cpp EXPORTS = nppg.h npglue.h nppriv.h nsMalloc.h - EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) -REQUIRES = lay layer js style applet img util java pref xpcom raptor netcnvts plugin plugimpl oji ojiimpl caps - -ifeq ($(subst /,_,$(shell uname -s)),OS2) -CPPSRCS = npwplat.cpp -REQUIRES += xp libfont os2font jtools -endif - include $(topsrcdir)/config/rules.mk ifeq ($(subst /,_,$(shell uname -s)),OS2) +CPPSRCS = npwplat.cpp +REQUIRES += xp libfont os2font jtools INCLUDES += -I$(DEPTH)/cmd/os2fe/nfc/include -I$(DEPTH)/cmd/os2fe -I$(DEPTH)/cmd/winfe endif INCLUDES += -I$(srcdir)/. -$(LIBRARY): $(OBJS) diff --git a/modules/plugin/test/Makefile.in b/modules/plugin/test/Makefile.in index 20c5e95f7e71..8249f9343535 100644 --- a/modules/plugin/test/Makefile.in +++ b/modules/plugin/test/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,33 +13,27 @@ # Communications Corporation. Portions created by Netscape are # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. +# -DEPTH = ../../.. +DEPTH = ../../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MODULE = npsimple -LIBRARY_NAME = npsimple -IS_COMPONENT = 1 +MODULE = npsimple +LIBRARY_NAME = npsimple +IS_COMPONENT = 1 -LOCAL_INCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../public +CPPSRCS = npsimple.cpp -CPPSRCS = \ - npsimple.cpp \ - $(NULL) - -include $(topsrcdir)/config/config.mk - -CXXFLAGS += $(MOZ_TOOLKIT_REGISTRY_CFLAGS) +LOCAL_INCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../public include $(topsrcdir)/config/rules.mk -EXPORT_RESOURCE_SAMPLES := \ - $(srcdir)/samples/embed-test.html \ - $(NULL) +CXXFLAGS += $(MOZ_TOOLKIT_REGISTRY_CFLAGS) + +install:: + $(INSTALL) $(srcdir)/samples/embed-test.html $(DIST)/bin/res/samples -install:: - $(INSTALL) $(EXPORT_RESOURCE_SAMPLES) $(DIST)/bin/res/samples diff --git a/modules/zlib/Makefile.in b/modules/zlib/Makefile.in index 03696717c15d..b14f2b832a4f 100644 --- a/modules/zlib/Makefile.in +++ b/modules/zlib/Makefile.in @@ -1,5 +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 @@ -17,13 +15,14 @@ # Reserved. # -DEPTH = ../.. +DEPTH = ../.. topsrcdir = @top_srcdir@ -VPATH = @srcdir@ srcdir = @srcdir@ +VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = src +DIRS = src include $(topsrcdir)/config/rules.mk +