General cleanup.

git-svn-id: svn://10.0.0.236/trunk@48156 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/xpcom/appshell/eventloop/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,20 @@
 # 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
 
-include $(topsrcdir)/config/config.mk
-
-DIRS = xp
+DIRS		= xp
 
 ifneq (,$(filter gtk photon,$(MOZ_WIDGET_TOOLKIT)))
-DIRS += $(MOZ_WIDGET_TOOLKIT)
+DIRS		+= $(MOZ_WIDGET_TOOLKIT)
 endif
 
 include $(topsrcdir)/config/rules.mk
+

mozilla/xpcom/appshell/eventloop/photon/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
@@ -17,45 +16,44 @@
 #
 # Contributor(s):
 #   Jerry Kirk <Jerry.Kirk@NexwareCorp.com>
+#
 
-DEPTH = ../../../..
+DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = eventloop
-MODULE=xpcom_eventloop_photon
-REQUIRES=xpcom
-IS_COMPONENT    = 1
+MODULE		= xpcom_eventloop_photon
+LIBRARY_NAME	= eventloop
+IS_COMPONENT	= 1
 
-CPPSRCS =					\
-	nsCPhEvent.cpp			\
-	nsCEvent.cpp 			\
-	nsCEventFilter.cpp 		\
-	nsCPlatformBaseLoop.cpp	\
-	nsCAppLoop.cpp
+REQUIRES	= xpcom
 
-LOCAL_INCLUDES += -I. -I../xp
+CPPSRCS		= \
+		nsCPhEvent.cpp \
+		nsCEvent.cpp \
+		nsCEventFilter.cpp \
+		nsCPlatformBaseLoop.cpp \
+		nsCAppLoop.cpp \
+		$(NULL)
 
-include $(topsrcdir)/config/config.mk
+LOCAL_INCLUDES	= -I. -I../xp
 
-CXXFLAGS +=  $(TK_CFLAGS)
+SHARED_LIBRARY_LIBS = ../xp/libxp_eventloop.a
 
-SHARED_LIBRARY_LIBS =			    \
-	../xp/libxp_eventloop.a \
-	$(NULL)
-
-EXTRA_DSO_LDOPTS+=	       \
-	$(TOOLKIT_DSO_LDOPTS) \
-	$(MKSHLIB_FORCE_ALL)   \
-	$(SHARED_LIBRARY_LIBS) \
-	$(MKSHLIB_UNFORCE_ALL) \
-	$(NULL)
-
-EXTRA_DSO_LDOPTS += $(TK_LIBS)
+EXTRA_DSO_LDOPTS = \
+		$(TOOLKIT_DSO_LDOPTS) \
+		$(MKSHLIB_FORCE_ALL) \
+		$(SHARED_LIBRARY_LIBS) \
+		$(MKSHLIB_UNFORCE_ALL) \
+		$(TK_LIBS) \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
+CXXFLAGS	+= $(TK_CFLAGS)
+
 $(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile
+

mozilla/xpcom/appshell/eventloop/xp/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,46 +13,39 @@
 # 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
 
-include $(topsrcdir)/config/config.mk
+MODULE		= xpcom_eventloop_xp
+LIBRARY_NAME	= xp_eventloop
 
-LIBRARY_NAME=xp_eventloop
+REQUIRES	= xpcom
 
-MODULE=xpcom_eventloop_xp
+CPPSRCS		= \
+		nsCBaseAppLoop.cpp \
+		nsCBaseBreathLoop.cpp \
+		nsCBaseLoop.cpp \
+		nsCBaseThreadLoop.cpp \
+		nsCLoopModule.cpp \
+		$(NULL)
 
-XPIDLSRCS =			 		\
-	nsCEventLoop.idl		\
-	nsIDispatchListener.idl	\
-	nsIEvent.idl			\
-	nsIEventFilter.idl		\
-	nsIEventLoop.idl		\
-	nsITranslateListener.idl\
-	nsPIEventLoop.idl		\
-	$(NULL)
+XPIDLSRCS	= \
+		nsCEventLoop.idl \
+		nsIDispatchListener.idl \
+		nsIEvent.idl \
+		nsIEventFilter.idl \
+		nsIEventLoop.idl \
+		nsITranslateListener.idl \
+		nsPIEventLoop.idl \
+		$(NULL)
 
-CPPSRCS = \
-	nsCBaseAppLoop.cpp		\
-	nsCBaseBreathLoop.cpp	\
-	nsCBaseLoop.cpp			\
-	nsCBaseThreadLoop.cpp	\
-	nsCLoopModule.cpp		\
-	$(NULL)
-
-LOCAL_INCLUDES += -I.
-
-ifneq (,$(filter gtk photon,$(MOZ_WIDGET_TOOLKIT)))
-LOCAL_INCLUDES += -I../$(MOZ_WIDGET_TOOLKIT)
-CXXFLAGS += $(TK_CFLAGS)
-endif
-
-REQUIRES = xpcom
+LOCAL_INCLUDES	= -I.
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 override NO_SHARED_LIB=1
@@ -61,3 +53,8 @@ override NO_STATIC_LIB=
 
 include $(topsrcdir)/config/rules.mk
 
+ifneq (,$(filter gtk photon,$(MOZ_WIDGET_TOOLKIT)))
+LOCAL_INCLUDES	+= -I../$(MOZ_WIDGET_TOOLKIT)
+CXXFLAGS	+= $(TK_CFLAGS)
+endif
+