blob: ead3516ac03a1d11fd55d3dd35160e81e9450516 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
|
# don't require third_party dir present for build after
# removing it via uscan and an exclude in d/copyright
--- a/configure.ac
+++ b/configure.ac
@@ -542,8 +542,6 @@
doc/xsl/Makefile
doc/xsl/catalog.xml
doc/Makefile
-third_party/luajit/Makefile
-third_party/concurrency_kit/Makefile
src/Makefile
src/drivers/Makefile
src/drivers/mysql/Makefile
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,15 +18,7 @@
ACLOCAL_AMFLAGS = -I m4
AM_DISTCHECK_CONFIGURE_FLAGS = --without-mysql
-if USE_BUNDLED_LUAJIT
- LUAJIT_DIR = third_party/luajit
-endif
-
-if USE_BUNDLED_CK
- CK_DIR = third_party/concurrency_kit
-endif
-
-SUBDIRS = doc $(LUAJIT_DIR) $(CK_DIR) src tests
+SUBDIRS = doc src tests
EXTRA_DIST = autogen.sh README.md README-WIN.txt README-Oracle.md ChangeLog \
snap/snapcraft.yaml.in third_party/cram \
@@ -37,10 +29,10 @@
scripts/buildpack.sh
dist-hook:
- $(MAKE) -C $(distdir)/third_party/cram clean
+ $(MAKE) -C $(distdir)/third_party/cram clean || true
test:
cd tests && $(MAKE) test
clean-local:
- $(MAKE) -C $(top_srcdir)/third_party/cram clean
+ $(MAKE) -C $(top_srcdir)/third_party/cram clean || true
|