Back out Bug 678867.
authorKyle Huey <khuey@kylehuey.com>
Fri, 19 Aug 2011 15:17:19 -0400
changeset 75541 5d5b7df70df08dd62980dfce94c646060c420daf
parent 75540 ce42b01e7f9578eec9b796922eda930557937570
child 75542 f0c4572db26071ae0863f0d2e97581d876851fd0
push id3
push userfelipc@gmail.com
push dateFri, 30 Sep 2011 20:09:13 +0000
bugs678867
milestone9.0a1
Back out Bug 678867.
js/src/Makefile.in
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -467,20 +467,21 @@ ifeq (arm, $(TARGET_CPU))
 endif
 #
 # END enclude sources for the Nitro assembler
 #############################################
 
 endif
 
 ifdef JS_HAS_CTYPES
+VPATH += $(srcdir)/ctypes
 
 CPPSRCS += \
-    ctypes/CTypes.cpp \
-    ctypes/Library.cpp \
+    CTypes.cpp \
+    Library.cpp \
     $(NULL)
 
 ifdef MOZ_NATIVE_FFI
 LOCAL_INCLUDES = $(MOZ_FFI_CFLAGS)
 else
 LOCAL_INCLUDES = -Ictypes/libffi/include
 endif
 
@@ -510,22 +511,23 @@ INSTALLED_HEADERS += \
 		$(CURDIR)/javascript-trace.h \
 		$(NULL)
 endif
 
 # PerfMeasurement is available regardless of low-level support for it;
 # it just doesn't necessarily do anything useful.  There is one
 # implementation source file per supported operating system, plus a stub
 # for unsupported OSes, plus the Javascript wrapper.
-INSTALLED_HEADERS += perf/jsperf.h
-CPPSRCS += perf/jsperf.cpp
+VPATH += $(srcdir)/perf
+INSTALLED_HEADERS += jsperf.h
+CPPSRCS += jsperf.cpp
 ifdef HAVE_LINUX_PERF_EVENT_H
-CPPSRCS += perf/pm_linux.cpp
+CPPSRCS += pm_linux.cpp
 else
-CPPSRCS += perf/pm_stub.cpp
+CPPSRCS += pm_stub.cpp
 endif
 
 ifeq ($(OS_ARCH),WINNT)
 INSTALLED_HEADERS += jscpucfg.h
 endif
 
 EXPORTS = $(INSTALLED_HEADERS)
 
@@ -728,24 +730,16 @@ DIST_GARBAGE = config.cache config.log c
 
 distclean::
 	cat unallmakefiles | $(XARGS) rm -f
 	$(RM) $(DIST_GARBAGE)
 
 # our build system doesn't handle subdir srcs very gracefully today
 export::
 	$(MKDIR) -p nanojit
-	$(MKDIR) -p vm
-	$(MKDIR) -p frontend
-	$(MKDIR) -p tracejit
-	$(MKDIR) -p methodjit
-	$(MKDIR) -p v8-dtoa
-	$(MKDIR) -p perf
-
-GARBAGE_DIRS += nanojit vm frontend tracejit methodjit v8-dtoa perf
 
 DEFINES		+= -DEXPORT_JS_API
 
 # mfbt is always packed with us, so if we're building a shared object,
 # we need to declare "exported" mfbt symbols on its behalf when we use
 # its headers.
 DEFINES		+= -DIMPL_MFBT