Bug 852869 - Remove some redundant Makefile.in files in comm-central - Move mime/emitters/src to mime/emitters Part 2. r=jcranmer
authorMark Banner <bugzilla@standard8.plus.com>
Tue, 07 May 2013 08:40:11 +0100
changeset 15483 2f747ef4292ebb0eb916f3b7e315e48ab8adce22
parent 15482 aeb3e1a89e9b5925a5d7676fc2be0f48f3bb068d
child 15484 730e8799d9590f034ff3c5686f0535a7836e1401
push id920
push userbugzilla@standard8.plus.com
push dateMon, 24 Jun 2013 19:03:14 +0000
treeherdercomm-beta@936bfe9d120b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjcranmer
bugs852869
Bug 852869 - Remove some redundant Makefile.in files in comm-central - Move mime/emitters/src to mime/emitters Part 2. r=jcranmer
mailnews/build/Makefile.in
mailnews/mime/emitters/Makefile.in
mailnews/mime/emitters/moz.build
mailnews/mime/emitters/nsEmitterUtils.cpp
mailnews/mime/emitters/nsEmitterUtils.h
mailnews/mime/emitters/nsMimeBaseEmitter.cpp
mailnews/mime/emitters/nsMimeBaseEmitter.h
mailnews/mime/emitters/nsMimeEmitterCID.h
mailnews/mime/emitters/nsMimeHtmlEmitter.cpp
mailnews/mime/emitters/nsMimeHtmlEmitter.h
mailnews/mime/emitters/nsMimePlainEmitter.cpp
mailnews/mime/emitters/nsMimePlainEmitter.h
mailnews/mime/emitters/nsMimeRawEmitter.cpp
mailnews/mime/emitters/nsMimeRawEmitter.h
mailnews/mime/emitters/nsMimeRebuffer.cpp
mailnews/mime/emitters/nsMimeRebuffer.h
mailnews/mime/emitters/nsMimeXmlEmitter.cpp
mailnews/mime/emitters/nsMimeXmlEmitter.h
mailnews/mime/emitters/src/Makefile.in
mailnews/mime/emitters/src/moz.build
mailnews/mime/emitters/src/nsEmitterUtils.cpp
mailnews/mime/emitters/src/nsEmitterUtils.h
mailnews/mime/emitters/src/nsMimeBaseEmitter.cpp
mailnews/mime/emitters/src/nsMimeBaseEmitter.h
mailnews/mime/emitters/src/nsMimeEmitterCID.h
mailnews/mime/emitters/src/nsMimeHtmlEmitter.cpp
mailnews/mime/emitters/src/nsMimeHtmlEmitter.h
mailnews/mime/emitters/src/nsMimePlainEmitter.cpp
mailnews/mime/emitters/src/nsMimePlainEmitter.h
mailnews/mime/emitters/src/nsMimeRawEmitter.cpp
mailnews/mime/emitters/src/nsMimeRawEmitter.h
mailnews/mime/emitters/src/nsMimeRebuffer.cpp
mailnews/mime/emitters/src/nsMimeRebuffer.h
mailnews/mime/emitters/src/nsMimeXmlEmitter.cpp
mailnews/mime/emitters/src/nsMimeXmlEmitter.h
--- a/mailnews/build/Makefile.in
+++ b/mailnews/build/Makefile.in
@@ -43,17 +43,17 @@ SHARED_LIBRARY_LIBS = \
 		../base/search/src/$(LIB_PREFIX)msgsearch_s.$(LIB_SUFFIX) \
 		../local/src//$(LIB_PREFIX)msglocal_s.$(LIB_SUFFIX) \
 	        ../compose/src/$(LIB_PREFIX)msgcompose_s.$(LIB_SUFFIX) \
 	        ../db/msgdb/src/$(LIB_PREFIX)msgdb_s.$(LIB_SUFFIX) \
 	        ../imap/src/$(LIB_PREFIX)msgimap_s.$(LIB_SUFFIX) \
 	        ../addrbook/src/$(LIB_PREFIX)addrbook_s.$(LIB_SUFFIX) \
 	        ../news/src/$(LIB_PREFIX)msgnews_s.$(LIB_SUFFIX) \
 	        ../mime/src/$(LIB_PREFIX)mime_s.$(LIB_SUFFIX) \
-	        ../mime/emitters/src/$(LIB_PREFIX)emitterutil_s.$(LIB_SUFFIX) \
+	        ../mime/emitters/$(LIB_PREFIX)emitterutil_s.$(LIB_SUFFIX) \
 	        ../extensions/bayesian-spam-filter/src/$(LIB_PREFIX)bayesflt_s.$(LIB_SUFFIX) \
 	        ../extensions/fts3/src/$(LIB_PREFIX)fts3tok_s.$(LIB_SUFFIX) \
 	        ../extensions/mailviews/src/$(LIB_PREFIX)mailview_s.$(LIB_SUFFIX) \
                 ../extensions/mdn/src/$(LIB_PREFIX)msgmdn_s.$(LIB_SUFFIX) \
                 ../mime/cthandlers/vcard/$(LIB_PREFIX)vcard_s.$(LIB_SUFFIX) \
                 ../mime/cthandlers/glue/$(LIB_PREFIX)mimecthglue_s.$(LIB_SUFFIX) \
                 ../mime/cthandlers/pgpmime/$(LIB_PREFIX)pgpmime_s.$(LIB_SUFFIX) \
                 $(NULL)
@@ -94,17 +94,17 @@ LOCAL_INCLUDES = -I$(srcdir) \
                  -I$(srcdir)/../base/src \
                  -I$(srcdir)/../base/util \
                  -I$(srcdir)/../local/src \
                  -I$(srcdir)/../addrbook/src \
                  -I$(srcdir)/../imap/src \
                  -I$(srcdir)/../compose/src \
                  -I$(srcdir)/../base/search/src \
                  -I$(srcdir)/../mime/src \
-                 -I$(srcdir)/../mime/emitters/src \
+                 -I$(srcdir)/../mime/emitters \
                  -I$(srcdir)/../news/src \
                  -I$(srcdir)/../extensions/bayesian-spam-filter/src \
                  -I$(srcdir)/../extensions/fts3/src \
                  -I$(srcdir)/../extensions/mailviews/src \
                  -I$(srcdir)/../extensions/mdn/src \
                  $(NULL)
 
 include $(topsrcdir)/config/rules.mk
rename from mailnews/mime/emitters/src/Makefile.in
rename to mailnews/mime/emitters/Makefile.in
rename from mailnews/mime/emitters/src/moz.build
rename to mailnews/mime/emitters/moz.build
rename from mailnews/mime/emitters/src/nsEmitterUtils.cpp
rename to mailnews/mime/emitters/nsEmitterUtils.cpp
rename from mailnews/mime/emitters/src/nsEmitterUtils.h
rename to mailnews/mime/emitters/nsEmitterUtils.h
rename from mailnews/mime/emitters/src/nsMimeBaseEmitter.cpp
rename to mailnews/mime/emitters/nsMimeBaseEmitter.cpp
rename from mailnews/mime/emitters/src/nsMimeBaseEmitter.h
rename to mailnews/mime/emitters/nsMimeBaseEmitter.h
rename from mailnews/mime/emitters/src/nsMimeEmitterCID.h
rename to mailnews/mime/emitters/nsMimeEmitterCID.h
rename from mailnews/mime/emitters/src/nsMimeHtmlEmitter.cpp
rename to mailnews/mime/emitters/nsMimeHtmlEmitter.cpp
rename from mailnews/mime/emitters/src/nsMimeHtmlEmitter.h
rename to mailnews/mime/emitters/nsMimeHtmlEmitter.h
rename from mailnews/mime/emitters/src/nsMimePlainEmitter.cpp
rename to mailnews/mime/emitters/nsMimePlainEmitter.cpp
rename from mailnews/mime/emitters/src/nsMimePlainEmitter.h
rename to mailnews/mime/emitters/nsMimePlainEmitter.h
rename from mailnews/mime/emitters/src/nsMimeRawEmitter.cpp
rename to mailnews/mime/emitters/nsMimeRawEmitter.cpp
rename from mailnews/mime/emitters/src/nsMimeRawEmitter.h
rename to mailnews/mime/emitters/nsMimeRawEmitter.h
rename from mailnews/mime/emitters/src/nsMimeRebuffer.cpp
rename to mailnews/mime/emitters/nsMimeRebuffer.cpp
rename from mailnews/mime/emitters/src/nsMimeRebuffer.h
rename to mailnews/mime/emitters/nsMimeRebuffer.h
rename from mailnews/mime/emitters/src/nsMimeXmlEmitter.cpp
rename to mailnews/mime/emitters/nsMimeXmlEmitter.cpp
rename from mailnews/mime/emitters/src/nsMimeXmlEmitter.h
rename to mailnews/mime/emitters/nsMimeXmlEmitter.h