bug 900330 - part 1 rm xpcom/typelib/xpidl/ r=ted
authorTrevor Saunders <trev.saunders@gmail.com>
Fri, 02 Aug 2013 23:30:09 -0400
changeset 141586 e5ebdc689486217b525fa9eb40809a254b6d375f
parent 141585 9caf24f498d5a36ee3ce07a905af2c64c4469306
child 141587 60287a04a9eada2a40b9489d94b643a172a8608d
push idunknown
push userunknown
push dateunknown
reviewersted
bugs900330
milestone26.0a1
bug 900330 - part 1 rm xpcom/typelib/xpidl/ r=ted
xpcom/idl-parser/Makefile.in
xpcom/typelib/moz.build
xpcom/typelib/xpidl/Makefile.in
xpcom/typelib/xpidl/moz.build
--- a/xpcom/idl-parser/Makefile.in
+++ b/xpcom/idl-parser/Makefile.in
@@ -11,31 +11,47 @@ VPATH = @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 PARSER_SRCS = \
   header.py \
   typelib.py \
   xpidl.py \
   $(NULL)
 
+SDK_BINARY = \
+  $(PARSER_SRCS) \
+  xpidllex.py \
+  xpidlyacc.py \
+  $(NULL)
+
+SDK_BINARY_TARGET = export
+
 ifndef MOZ_SYSTEM_PLY
-PLY_PROGS = \
+PLY_FILES = \
+  $(topsrcdir)/other-licenses/ply/ply/__init__.py \
   $(topsrcdir)/other-licenses/ply/ply/lex.py \
   $(topsrcdir)/other-licenses/ply/ply/yacc.py \
   $(NULL)
+
+PLY_DEST = $(SDK_BIN_DIR)/ply
+INSTALL_TARGETS += PLY
+PLY_TARGET = export
 endif
 
 include $(topsrcdir)/config/rules.mk
 
 # Generate the PLY lexer and parser.
-export:: $(PARSER_SRCS) $(PLY_PROGS)
+xpidllex.py: $(PARSER_SRCS) $(PLY_FILES)
 	$(PYTHON_PATH) \
 	  $(PLY_INCLUDE) \
 	  $(srcdir)/header.py --cachedir=. --regen
 
+# generating xpidllex.py generates xpidlyacc.py too
+xpidlyacc.py: xpidllex.py
+
 check::
 	$(PYTHON_PATH) \
 	  $(PLY_INCLUDE) \
 	  -I. \
 	  $(srcdir)/runtests.py
 
 GARBAGE += \
   xpidllex.py \
--- a/xpcom/typelib/moz.build
+++ b/xpcom/typelib/moz.build
@@ -1,10 +1,10 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DIRS += ['xpt', 'xpidl']
+DIRS += ['xpt']
 
 MODULE = 'xpcom'
 
deleted file mode 100644
--- a/xpcom/typelib/xpidl/Makefile.in
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(topsrcdir)/config/config.mk
-
-SDK_BINARY = \
-  $(topsrcdir)/xpcom/idl-parser/xpidl.py \
-  $(topsrcdir)/xpcom/idl-parser/header.py \
-  $(topsrcdir)/xpcom/idl-parser/typelib.py \
-  $(DEPTH)/xpcom/idl-parser/xpidllex.py \
-  $(DEPTH)/xpcom/idl-parser/xpidlyacc.py \
-  $(NULL)
-
-ifndef MOZ_SYSTEM_PLY
-$(SDK_BIN_DIR)/ply::
-	$(NSINSTALL) -D $@
-
-PLY_SRCS = \
-  $(topsrcdir)/other-licenses/ply/ply/__init__.py \
-  $(topsrcdir)/other-licenses/ply/ply/lex.py \
-  $(topsrcdir)/other-licenses/ply/ply/yacc.py \
-  $(NULL)
-
-export:: $(PLY_SRCS) $(SDK_BIN_DIR)/ply
-	$(INSTALL) $(IFLAGS2) $^
-endif
-
-include $(topsrcdir)/config/rules.mk
-
-export::
-	@$(MAKE) libs
deleted file mode 100644
--- a/xpcom/typelib/xpidl/moz.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MODULE = 'xpcom'
-