From bc596356af71d95eb2a341d0324a76e6b7e59a73 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Sun, 21 Apr 2019 22:56:13 +0200
Subject: Switch to using a submodule for autowaf

---
 waflib               |  1 +
 waflib/extras/dcc.py | 72 ----------------------------------------------------
 2 files changed, 1 insertion(+), 72 deletions(-)
 create mode 160000 waflib
 delete mode 100644 waflib/extras/dcc.py

(limited to 'waflib/extras/dcc.py')

diff --git a/waflib b/waflib
new file mode 160000
index 00000000..2314e236
--- /dev/null
+++ b/waflib
@@ -0,0 +1 @@
+Subproject commit 2314e236ca6e7d94a26c3c17091da0f25f5867f3
diff --git a/waflib/extras/dcc.py b/waflib/extras/dcc.py
deleted file mode 100644
index c1a57c04..00000000
--- a/waflib/extras/dcc.py
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/usr/bin/env python
-# encoding: utf-8
-# Jérôme Carretero, 2011 (zougloub)
-
-from waflib import Options
-from waflib.Tools import ccroot
-from waflib.Configure import conf
-
-@conf
-def find_dcc(conf):
-	conf.find_program(['dcc'], var='CC', path_list=getattr(Options.options, 'diabbindir', ""))
-	conf.env.CC_NAME = 'dcc'
-
-@conf
-def find_dld(conf):
-	conf.find_program(['dld'], var='LINK_CC', path_list=getattr(Options.options, 'diabbindir', ""))
-	conf.env.LINK_CC_NAME = 'dld'
-
-@conf
-def find_dar(conf):
-	conf.find_program(['dar'], var='AR', path_list=getattr(Options.options, 'diabbindir', ""))
-	conf.env.AR_NAME = 'dar'
-	conf.env.ARFLAGS = 'rcs'
-
-@conf
-def find_ddump(conf):
-	conf.find_program(['ddump'], var='DDUMP', path_list=getattr(Options.options, 'diabbindir', ""))
-
-@conf
-def dcc_common_flags(conf):
-	v = conf.env
-	v['CC_SRC_F']            = []
-	v['CC_TGT_F']            = ['-c', '-o']
-
-	# linker
-	if not v['LINK_CC']:
-		v['LINK_CC'] = v['CC']
-	v['CCLNK_SRC_F']         = []
-	v['CCLNK_TGT_F']         = ['-o']
-	v['CPPPATH_ST']          = '-I%s'
-	v['DEFINES_ST']          = '-D%s'
-
-	v['LIB_ST']              = '-l:%s' # template for adding libs
-	v['LIBPATH_ST']          = '-L%s' # template for adding libpaths
-	v['STLIB_ST']            = '-l:%s'
-	v['STLIBPATH_ST']        = '-L%s'
-	v['RPATH_ST']            = '-Wl,-rpath,%s'
-	#v['STLIB_MARKER']        = '-Wl,-Bstatic'
-
-	# program
-	v['cprogram_PATTERN']    = '%s.elf'
-
-	# static lib
-	v['LINKFLAGS_cstlib']    = ['-Wl,-Bstatic']
-	v['cstlib_PATTERN']      = 'lib%s.a'
-
-def configure(conf):
-	conf.find_dcc()
-	conf.find_dar()
-	conf.find_dld()
-	conf.find_ddump()
-	conf.dcc_common_flags()
-	conf.cc_load_tools()
-	conf.cc_add_flags()
-	conf.link_add_flags()
-
-def options(opt):
-	"""
-	Add the ``--with-diab-bindir`` command-line options.
-	"""
-	opt.add_option('--with-diab-bindir', type='string', dest='diabbindir', help = 'Specify alternate diab bin folder', default="")
-
-- 
cgit v1.2.1