From 18db6b773d7a1d4d9263c462563b313ff805d0b1 Mon Sep 17 00:00:00 2001 From: "briano%netscape.com" Date: Wed, 15 Sep 1999 00:33:49 +0000 Subject: [PATCH] General cleanup. --- mailnews/mime/Makefile.in | 12 ++-- mailnews/mime/abstatus/Makefile.in | 11 ++- mailnews/mime/abstatus/build/Makefile.in | 11 +-- mailnews/mime/abstatus/resources/Makefile.in | 10 ++- .../mime/abstatus/resources/skin/Makefile.in | 19 ++--- mailnews/mime/abstatus/src/Makefile.in | 13 ++-- mailnews/mime/build/Makefile.in | 13 ++-- mailnews/mime/cthandlers/Makefile.in | 10 ++- mailnews/mime/cthandlers/calendar/Makefile.in | 2 +- .../mime/cthandlers/resources/Makefile.in | 20 ++---- mailnews/mime/cthandlers/vcard/Makefile.in | 5 +- mailnews/mime/emitters/Makefile.in | 11 ++- mailnews/mime/emitters/build/Makefile.in | 2 +- mailnews/mime/emitters/resources/Makefile.in | 10 ++- .../mime/emitters/resources/skin/Makefile.in | 29 +++----- mailnews/mime/emitters/src/Makefile.in | 5 +- mailnews/mime/public/Makefile.in | 31 ++++----- mailnews/mime/resources/Makefile.in | 21 ++---- mailnews/mime/resources/skin/Makefile.in | 32 ++++----- mailnews/mime/src/Makefile.in | 69 ++++++++++--------- mailnews/mime/tests/Makefile.in | 9 +-- mailnews/mime/tests/mimetest/Makefile.in | 18 +---- mailnews/mime/tests/xpcomtest/Makefile.in | 13 ++-- 23 files changed, 139 insertions(+), 237 deletions(-) diff --git a/mailnews/mime/Makefile.in b/mailnews/mime/Makefile.in index 8b29a253ce2b..fb218cc4aa32 100644 --- a/mailnews/mime/Makefile.in +++ b/mailnews/mime/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,21 +13,20 @@ # 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 = public src emitters cthandlers build resources +DIRS = public src emitters cthandlers build resources ifdef ENABLE_TESTS -DIRS += tests +DIRS += tests endif -include $(topsrcdir)/config/config.mk - include $(topsrcdir)/config/rules.mk diff --git a/mailnews/mime/abstatus/Makefile.in b/mailnews/mime/abstatus/Makefile.in index 8381cb3eb770..37eeead845b2 100644 --- a/mailnews/mime/abstatus/Makefile.in +++ b/mailnews/mime/abstatus/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,18 +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 = src build resources - - -include $(topsrcdir)/config/config.mk +DIRS = src build resources include $(topsrcdir)/config/rules.mk diff --git a/mailnews/mime/abstatus/build/Makefile.in b/mailnews/mime/abstatus/build/Makefile.in index 12176e33f1c4..4ada1da1020a 100644 --- a/mailnews/mime/abstatus/build/Makefile.in +++ b/mailnews/mime/abstatus/build/Makefile.in @@ -17,8 +17,8 @@ DEPTH = ../../../.. topsrcdir = @top_srcdir@ -VPATH = @srcdir@ srcdir = @srcdir@ +VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk @@ -27,15 +27,8 @@ LIBRARY_NAME = abstat IS_COMPONENT = 1 CPPSRCS = nsMiscStatusFactory.cpp -EXPORTS = - -SHARED_LIBRARY_LIBS = \ - $(NULL) EXTRA_DSO_LDOPTS = \ - $(MKSHLIB_FORCE_ALL) \ - $(SHARED_LIBRARY_LIBS) \ - $(MKSHLIB_UNFORCE_ALL) \ -L$(DIST)/bin \ -L$(DIST)/lib \ -lxpcom \ @@ -44,5 +37,3 @@ EXTRA_DSO_LDOPTS = \ include $(topsrcdir)/config/rules.mk -$(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile - diff --git a/mailnews/mime/abstatus/resources/Makefile.in b/mailnews/mime/abstatus/resources/Makefile.in index e7392e91f426..7bd784f38dd8 100644 --- a/mailnews/mime/abstatus/resources/Makefile.in +++ b/mailnews/mime/abstatus/resources/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,17 +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= skin content - -include $(topsrcdir)/config/config.mk +DIRS = skin content include $(topsrcdir)/config/rules.mk diff --git a/mailnews/mime/abstatus/resources/skin/Makefile.in b/mailnews/mime/abstatus/resources/skin/Makefile.in index 6ddab1d66779..cea4673f3d20 100644 --- a/mailnews/mime/abstatus/resources/skin/Makefile.in +++ b/mailnews/mime/abstatus/resources/skin/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,27 +13,17 @@ # 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 -include $(topsrcdir)/config/config.mk - include $(topsrcdir)/config/rules.mk -MESSENGER_DIR = $(DIST)/bin/chrome/messenger/skin/default -EXPORT_RESOURCES = \ - $(srcdir)/abookstat.gif \ - $(NULL) - -EXPORT_RESOURCES_TO_REMOVE := $(addprefix $(MESSENGER_DIR)/, $(EXPORT_RESOURCES)) - install:: - $(INSTALL) $(EXPORT_RESOURCES) $(MESSENGER_DIR) + $(INSTALL) $(srcdir)/abookstat.gif $(DIST)/bin/chrome/messenger/skin/default -clobber:: - $(RM) $(EXPORT_RESOURCES_TO_REMOVE) diff --git a/mailnews/mime/abstatus/src/Makefile.in b/mailnews/mime/abstatus/src/Makefile.in index 82ff42575ab3..0893eaca3129 100644 --- a/mailnews/mime/abstatus/src/Makefile.in +++ b/mailnews/mime/abstatus/src/Makefile.in @@ -17,21 +17,17 @@ DEPTH = ../../../.. topsrcdir = @top_srcdir@ -VPATH = @srcdir@ srcdir = @srcdir@ +VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MODULE = abstat LIBRARY_NAME = abstat_s -EXPORTS = \ - nsMimeMiscStatus.h \ - $(NULL) +CPPSRCS = nsMimeMiscStatus.cpp -CPPSRCS = \ - nsMimeMiscStatus.cpp \ - $(NULL) +EXPORTS = nsMimeMiscStatus.h EXTRA_DSO_LDOPTS = \ -L$(DIST)/bin \ @@ -39,10 +35,9 @@ EXTRA_DSO_LDOPTS = \ -lxpcom \ $(NULL) -include $(topsrcdir)/config/config.mk - # we don't want the shared lib, but we want to force the creation of a static lib. override NO_SHARED_LIB=1 override NO_STATIC_LIB= include $(topsrcdir)/config/rules.mk + diff --git a/mailnews/mime/build/Makefile.in b/mailnews/mime/build/Makefile.in index c7dd45aaf9f9..2e08e57dacdb 100644 --- a/mailnews/mime/build/Makefile.in +++ b/mailnews/mime/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,20 +13,18 @@ # 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@ -MODULE = mime +VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -EXPORTS = \ - nsMsgMimeCID.h \ - $(NULL) +MODULE = mime -include $(topsrcdir)/config/config.mk +EXPORTS = nsMsgMimeCID.h include $(topsrcdir)/config/rules.mk diff --git a/mailnews/mime/cthandlers/Makefile.in b/mailnews/mime/cthandlers/Makefile.in index 5ac52816db5a..05fc39982c15 100644 --- a/mailnews/mime/cthandlers/Makefile.in +++ b/mailnews/mime/cthandlers/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,17 +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 = vcard resources - -include $(topsrcdir)/config/config.mk +DIRS = vcard resources include $(topsrcdir)/config/rules.mk diff --git a/mailnews/mime/cthandlers/calendar/Makefile.in b/mailnews/mime/cthandlers/calendar/Makefile.in index a096f1d71619..263ad3f11c85 100644 --- a/mailnews/mime/cthandlers/calendar/Makefile.in +++ b/mailnews/mime/cthandlers/calendar/Makefile.in @@ -17,8 +17,8 @@ DEPTH = ../../../.. topsrcdir = @top_srcdir@ -VPATH = @srcdir@ srcdir = @srcdir@ +VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk diff --git a/mailnews/mime/cthandlers/resources/Makefile.in b/mailnews/mime/cthandlers/resources/Makefile.in index 75caa3f1271b..4b913e1b5bb6 100644 --- a/mailnews/mime/cthandlers/resources/Makefile.in +++ b/mailnews/mime/cthandlers/resources/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,28 +13,17 @@ # 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 -include $(topsrcdir)/config/config.mk - include $(topsrcdir)/config/rules.mk -MESSENGER_DIR = $(DIST)/bin/chrome/messenger/content/default - -EXPORT_RESOURCES = \ - $(srcdir)/vcard_en.properties \ - $(NULL) - -EXPORT_RESOURCES_TO_REMOVE := $(addprefix $(MESSENGER_DIR)/, $(EXPORT_RESOURCES)) - install:: - $(INSTALL) $(EXPORT_RESOURCES) $(MESSENGER_DIR) + $(INSTALL) $(srcdir)/vcard_en.properties $(DIST)/bin/chrome/messenger/content/default -clobber:: - $(RM) $(EXPORT_RESOURCES_TO_REMOVE) diff --git a/mailnews/mime/cthandlers/vcard/Makefile.in b/mailnews/mime/cthandlers/vcard/Makefile.in index 0043b545aaee..402950343c9a 100644 --- a/mailnews/mime/cthandlers/vcard/Makefile.in +++ b/mailnews/mime/cthandlers/vcard/Makefile.in @@ -17,8 +17,8 @@ DEPTH = ../../../.. topsrcdir = @top_srcdir@ -VPATH = @srcdir@ srcdir = @srcdir@ +VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk @@ -45,5 +45,6 @@ EXTRA_DSO_LDOPTS = \ include $(topsrcdir)/config/rules.mk ifeq ($(OS_ARCH), Linux) -DEFINES += -D_BSD_SOURCE +DEFINES += -D_BSD_SOURCE endif + diff --git a/mailnews/mime/emitters/Makefile.in b/mailnews/mime/emitters/Makefile.in index 8381cb3eb770..37eeead845b2 100644 --- a/mailnews/mime/emitters/Makefile.in +++ b/mailnews/mime/emitters/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,18 +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 = src build resources - - -include $(topsrcdir)/config/config.mk +DIRS = src build resources include $(topsrcdir)/config/rules.mk diff --git a/mailnews/mime/emitters/build/Makefile.in b/mailnews/mime/emitters/build/Makefile.in index c9ec85e16297..081146b2067d 100644 --- a/mailnews/mime/emitters/build/Makefile.in +++ b/mailnews/mime/emitters/build/Makefile.in @@ -17,8 +17,8 @@ DEPTH = ../../../.. topsrcdir = @top_srcdir@ -VPATH = @srcdir@ srcdir = @srcdir@ +VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk diff --git a/mailnews/mime/emitters/resources/Makefile.in b/mailnews/mime/emitters/resources/Makefile.in index e7392e91f426..7bd784f38dd8 100644 --- a/mailnews/mime/emitters/resources/Makefile.in +++ b/mailnews/mime/emitters/resources/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,17 +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= skin content - -include $(topsrcdir)/config/config.mk +DIRS = skin content include $(topsrcdir)/config/rules.mk diff --git a/mailnews/mime/emitters/resources/skin/Makefile.in b/mailnews/mime/emitters/resources/skin/Makefile.in index fd981093aeda..8ad0ea306e63 100644 --- a/mailnews/mime/emitters/resources/skin/Makefile.in +++ b/mailnews/mime/emitters/resources/skin/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,31 +13,25 @@ # 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 -include $(topsrcdir)/config/config.mk +EXPORT_RESOURCES = \ + $(srcdir)/mailheader-micro.css \ + $(srcdir)/mailheader-normal.css \ + $(srcdir)/mailheader-all.css \ + $(srcdir)/addcard.gif \ + $(srcdir)/attach.gif \ + $(NULL) include $(topsrcdir)/config/rules.mk -MESSENGER_DIR = $(DIST)/bin/chrome/messenger/skin/default -EXPORT_RESOURCES = \ - $(srcdir)/mailheader-micro.css \ - $(srcdir)/mailheader-normal.css \ - $(srcdir)/mailheader-all.css \ - $(srcdir)/addcard.gif \ - $(srcdir)/attach.gif \ - $(NULL) - -EXPORT_RESOURCES_TO_REMOVE := $(addprefix $(MESSENGER_DIR)/, $(EXPORT_RESOURCES)) - install:: - $(INSTALL) $(EXPORT_RESOURCES) $(MESSENGER_DIR) + $(INSTALL) $(EXPORT_RESOURCES) $(DIST)/bin/chrome/messenger/skin/default -clobber:: - $(RM) $(EXPORT_RESOURCES_TO_REMOVE) diff --git a/mailnews/mime/emitters/src/Makefile.in b/mailnews/mime/emitters/src/Makefile.in index 7f2095e608ca..eb1b419ec388 100644 --- a/mailnews/mime/emitters/src/Makefile.in +++ b/mailnews/mime/emitters/src/Makefile.in @@ -17,8 +17,8 @@ DEPTH = ../../../.. topsrcdir = @top_srcdir@ -VPATH = @srcdir@ srcdir = @srcdir@ +VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk @@ -49,10 +49,9 @@ EXTRA_DSO_LDOPTS = \ -lxpcom \ $(NULL) -include $(topsrcdir)/config/config.mk - # we don't want the shared lib, but we want to force the creation of a static lib. override NO_SHARED_LIB=1 override NO_STATIC_LIB= include $(topsrcdir)/config/rules.mk + diff --git a/mailnews/mime/public/Makefile.in b/mailnews/mime/public/Makefile.in index 8dd9b52a69a2..5625ff1c5774 100644 --- a/mailnews/mime/public/Makefile.in +++ b/mailnews/mime/public/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,32 +13,32 @@ # 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@ -MODULE = mime +VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -XPIDLSRCS = \ - nsIMimeStreamConverter.idl \ - nsIMimeEmitter.idl \ +MODULE = mime + +EXPORTS = \ + nsIMimeConverter.h \ + nsIMimeObjectClassAccess.h \ + nsMailHeaders.h \ + nsIMimeContentTypeHandler.h \ + $(NULL) + +XPIDLSRCS = \ + nsIMimeStreamConverter.idl \ + nsIMimeEmitter.idl \ nsIMimeURLUtils.idl \ nsIMsgHeaderParser.idl \ nsIMimeMiscStatus.idl \ nsIMimeHeaders.idl \ $(NULL) -EXPORTS = \ - nsIMimeConverter.h \ - nsIMimeObjectClassAccess.h \ - nsMailHeaders.h \ - nsIMimeContentTypeHandler.h \ - $(NULL) - -include $(topsrcdir)/config/config.mk - include $(topsrcdir)/config/rules.mk diff --git a/mailnews/mime/resources/Makefile.in b/mailnews/mime/resources/Makefile.in index a3f00871288c..3bb15ae6e315 100644 --- a/mailnews/mime/resources/Makefile.in +++ b/mailnews/mime/resources/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,29 +13,19 @@ # 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 -MESSENGER_DIR = $(DIST)/bin/res/mailnews/messenger +DIRS = skin content -DIRS = skin content - -EXPORT_RESOURCES = \ - $(srcdir)/mime_en.properties \ - $(NULL) - -EXPORT_RESOURCES_TO_REMOVE := $(addprefix $(MESSENGER_DIR)/, $(EXPORT_RESOURCES)) - -include $(topsrcdir)/config/config.mk include $(topsrcdir)/config/rules.mk install:: - $(INSTALL) $(EXPORT_RESOURCES) $(MESSENGER_DIR) + $(INSTALL) $(srcdir)/mime_en.properties $(DIST)/bin/res/mailnews/messenger -clobber:: - $(RM) $(EXPORT_RESOURCES_TO_REMOVE) diff --git a/mailnews/mime/resources/skin/Makefile.in b/mailnews/mime/resources/skin/Makefile.in index 23e1f0fcffb2..2195268e6e8e 100644 --- a/mailnews/mime/resources/skin/Makefile.in +++ b/mailnews/mime/resources/skin/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,26 @@ # 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 -include $(topsrcdir)/config/config.mk +EXPORT_RESOURCES = \ + $(srcdir)/smile.gif \ + $(srcdir)/frown.gif \ + $(srcdir)/wink.gif \ + $(srcdir)/sick.gif \ + $(srcdir)/less.gif \ + $(srcdir)/more.gif \ + $(NULL) include $(topsrcdir)/config/rules.mk -MESSENGER_DIR = $(DIST)/bin/chrome/messenger/skin/default - -EXPORT_RESOURCES = \ - $(srcdir)/smile.gif \ - $(srcdir)/frown.gif \ - $(srcdir)/wink.gif \ - $(srcdir)/sick.gif \ - $(srcdir)/less.gif \ - $(srcdir)/more.gif \ - $(NULL) - -EXPORT_RESOURCES_TO_REMOVE := $(addprefix $(MESSENGER_DIR)/, $(EXPORT_RESOURCES)) - install:: - $(INSTALL) $(EXPORT_RESOURCES) $(MESSENGER_DIR) + $(INSTALL) $(EXPORT_RESOURCES) $(DIST)/bin/chrome/messenger/skin/default -clobber:: - $(RM) $(EXPORT_RESOURCES_TO_REMOVE) diff --git a/mailnews/mime/src/Makefile.in b/mailnews/mime/src/Makefile.in index cc8ba5bd1b5c..b2be1c3c4ef4 100644 --- a/mailnews/mime/src/Makefile.in +++ b/mailnews/mime/src/Makefile.in @@ -17,8 +17,8 @@ DEPTH = ../../.. topsrcdir = @top_srcdir@ -VPATH = @srcdir@ srcdir = @srcdir@ +VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk @@ -34,41 +34,41 @@ CPPSRCS = \ nsMimeObjectClassAccess.cpp \ nsMimeConverter.cpp \ nsMimeAddress.cpp \ - mimecont.cpp \ - mimeebod.cpp \ - mimeenc.cpp \ - mimeeobj.cpp \ - mimehdrs.cpp \ - mimei.cpp \ - mimeiimg.cpp \ - mimeleaf.cpp \ - mimemalt.cpp \ - mimemapl.cpp \ - mimemdig.cpp \ - mimemmix.cpp \ - mimempar.cpp \ - mimemrel.cpp \ - mimemsg.cpp \ - mimemsig.cpp \ - mimemult.cpp \ - mimeobj.cpp \ - mimepbuf.cpp \ - mimesun.cpp \ - mimetenr.cpp \ - mimetext.cpp \ - mimethtm.cpp \ - mimetpla.cpp \ - mimetric.cpp \ - mimeunty.cpp \ - mimecth.cpp \ - mimebuf.cpp \ - mimecom.cpp \ - mimemoz2.cpp \ - comi18n.cpp \ + mimecont.cpp \ + mimeebod.cpp \ + mimeenc.cpp \ + mimeeobj.cpp \ + mimehdrs.cpp \ + mimei.cpp \ + mimeiimg.cpp \ + mimeleaf.cpp \ + mimemalt.cpp \ + mimemapl.cpp \ + mimemdig.cpp \ + mimemmix.cpp \ + mimempar.cpp \ + mimemrel.cpp \ + mimemsg.cpp \ + mimemsig.cpp \ + mimemult.cpp \ + mimeobj.cpp \ + mimepbuf.cpp \ + mimesun.cpp \ + mimetenr.cpp \ + mimetext.cpp \ + mimethtm.cpp \ + mimetpla.cpp \ + mimetric.cpp \ + mimeunty.cpp \ + mimecth.cpp \ + mimebuf.cpp \ + mimecom.cpp \ + mimemoz2.cpp \ + comi18n.cpp \ nsMimeTransition.cpp \ nsMsgHeaderParser.cpp \ nsStreamConverter.cpp \ - mimedrft.cpp \ + mimedrft.cpp \ nsMimeHeaders.cpp \ $(NULL) @@ -105,5 +105,6 @@ EXTRA_DSO_LDOPTS = \ include $(topsrcdir)/config/rules.mk ifeq ($(OS_ARCH), Linux) -DEFINES += -D_BSD_SOURCE +DEFINES += -D_BSD_SOURCE endif + diff --git a/mailnews/mime/tests/Makefile.in b/mailnews/mime/tests/Makefile.in index 769313be611d..5dfa8d8cd982 100644 --- a/mailnews/mime/tests/Makefile.in +++ b/mailnews/mime/tests/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,16 +13,14 @@ # 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 - -include $(topsrcdir)/config/config.mk - include $(topsrcdir)/config/rules.mk diff --git a/mailnews/mime/tests/mimetest/Makefile.in b/mailnews/mime/tests/mimetest/Makefile.in index faf0d6b4664b..e8117ed7e877 100644 --- a/mailnews/mime/tests/mimetest/Makefile.in +++ b/mailnews/mime/tests/mimetest/Makefile.in @@ -25,16 +25,8 @@ include $(DEPTH)/config/autoconf.mk PROGRAM = mimetest CPPSRCS = mimetest.cpp -BASE_LIBS = \ - -lmozjs \ - -lxpcom \ - $(NULL) - -GECKO_LIBS = \ +LIBS = \ -lraptorplugin \ - $(NULL) - -NETLIB_LIBS = \ -labouturl \ -lfileurl \ -lftpurl \ @@ -48,13 +40,9 @@ NETLIB_LIBS = \ -lnetlib \ -lnetwork \ -lpwcac \ - $(NULL) - -LIBS = \ - $(GECKO_LIBS) \ - $(NETLIB_LIBS) \ $(MOZ_TIMER_LIBS) \ - $(BASE_LIBS) \ + -lmozjs \ + -lxpcom \ $(NSPR_LIBS) \ $(TK_LIBS) \ $(NULL) diff --git a/mailnews/mime/tests/xpcomtest/Makefile.in b/mailnews/mime/tests/xpcomtest/Makefile.in index 946c55eac993..e8a936a5981c 100644 --- a/mailnews/mime/tests/xpcomtest/Makefile.in +++ b/mailnews/mime/tests/xpcomtest/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,20 +13,18 @@ # 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@ -MODULE = mimetest +VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -CPPSRCS = \ - test.cpp \ - $(NULL) +MODULE = mimetest -include $(topsrcdir)/config/config.mk +CPPSRCS = test.cpp include $(topsrcdir)/config/rules.mk