Bug 904030 - Remove unnecessary make rules in layout/base/Makefile.in; r=glandium

layout/base/Makefile.in

@@ -40,14 +40,3 @@ LOCAL_INCLUDES += \
 		$(NULL)
 
 CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PIXMAN_CFLAGS)
-
-ifndef MOZ_XUL
-nsIBoxObject.idl: %: $(topsrcdir)/layout/xul/base/public/%
-	$(INSTALL) $^ .
-nsPIBoxObject.h: %: $(topsrcdir)/layout/xul/base/public/%
-	$(INSTALL) $^ .
-nsBoxObject.cpp: %: $(topsrcdir)/layout/xul/base/src/%
-	$(INSTALL) $^ .
-
-GARBAGE    += nsIBoxObject.idl nsPIBoxObject.h nsBoxObject.cpp
-endif

layout/base/moz.build

@@ -10,17 +10,6 @@ XPIDL_SOURCES += [
     'nsIStyleSheetService.idl',
 ]
 
-if not CONFIG['MOZ_XUL']:
-    XPIDL_SOURCES += [
-        'nsIBoxObject.idl',
-    ]
-    EXPORTS    += [
-        'nsPIBoxObject.h',
-    ]
-    CPP_SOURCES += [
-        'nsBoxObject.cpp',
-    ]
-
 if CONFIG['IBMBIDI']:
     CPP_SOURCES += [
         'nsBidiPresUtils.cpp',

layout/xul/base/src/moz.build

@@ -11,6 +11,7 @@ CPP_SOURCES += [
     'nsBoxFrame.cpp',
     'nsBoxLayout.cpp',
     'nsBoxLayoutState.cpp',
+    'nsBoxObject.cpp',
     'nsButtonBoxFrame.cpp',
     'nsRepeatService.cpp',
     'nsRootBoxFrame.cpp',
@@ -31,7 +32,6 @@ if CONFIG['MOZ_XUL']:
         'nsMenuBoxObject.cpp',
         'nsPopupBoxObject.cpp',
         'nsListBoxObject.cpp',
-        'nsBoxObject.cpp',
         'nsImageBoxFrame.cpp',
         'nsDocElementBoxFrame.cpp',
         'nsLeafBoxFrame.cpp',