diff options
| author | kent@mysql.com <> | 2005-11-09 11:56:04 +0200 |
|---|---|---|
| committer | kent@mysql.com <> | 2005-11-09 11:56:04 +0200 |
| commit | b269caecb12b6b7da093f6924e5a7326cc1b75e9 (patch) | |
| tree | b788fd07a25a830fe3e0eee239517ef73ada1008 /extra | |
| parent | 4742f585b13d2a4dec93afdc9ada5a4d0c621f54 (diff) | |
| download | mariadb-git-b269caecb12b6b7da093f6924e5a7326cc1b75e9.tar.gz | |
Additional "make distcheck" changes specific to 5.0
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/Makefile.am | 3 | ||||
| -rw-r--r-- | extra/yassl/Makefile.am | 2 | ||||
| -rw-r--r-- | extra/yassl/src/Makefile.am | 2 | ||||
| -rw-r--r-- | extra/yassl/taocrypt/src/Makefile.am | 2 |
4 files changed, 6 insertions, 3 deletions
diff --git a/extra/Makefile.am b/extra/Makefile.am index 457fddce673..a60656cb5c6 100644 --- a/extra/Makefile.am +++ b/extra/Makefile.am @@ -23,6 +23,9 @@ BUILT_SOURCES= $(top_builddir)/include/mysqld_error.h \ $(top_builddir)/include/mysqld_ername.h pkginclude_HEADERS= $(BUILT_SOURCES) CLEANFILES = $(BUILT_SOURCES) +# We never use SUBDIRS here, but needed for automake 1.6.3 +# to generate code to handle DIST_SUBDIRS +SUBDIRS= DIST_SUBDIRS= yassl # This will build mysqld_error.h and sql_state.h diff --git a/extra/yassl/Makefile.am b/extra/yassl/Makefile.am index 7c1f2ea5acb..41c4d84f24f 100644 --- a/extra/yassl/Makefile.am +++ b/extra/yassl/Makefile.am @@ -1,2 +1,2 @@ SUBDIRS = taocrypt src -EXTRA_DIST = yassl.dsp yassl.dsw mySTL/*.hpp +EXTRA_DIST = yassl.dsp yassl.dsw $(wildcard mySTL/*.hpp) diff --git a/extra/yassl/src/Makefile.am b/extra/yassl/src/Makefile.am index 4ebb9a2d862..df96018e1cf 100644 --- a/extra/yassl/src/Makefile.am +++ b/extra/yassl/src/Makefile.am @@ -4,5 +4,5 @@ noinst_LIBRARIES = libyassl.a libyassl_a_SOURCES = buffer.cpp cert_wrapper.cpp crypto_wrapper.cpp \ handshake.cpp lock.cpp log.cpp socket_wrapper.cpp ssl.cpp \ template_instnt.cpp timer.cpp yassl_imp.cpp yassl_error.cpp yassl_int.cpp -EXTRA_DIST = ../include/*.hpp ../include/openssl/*.h +EXTRA_DIST = $(wildcard ../include/*.hpp) $(wildcard ../include/openssl/*.h) AM_CXXFLAGS = -DYASSL_PURE_C diff --git a/extra/yassl/taocrypt/src/Makefile.am b/extra/yassl/taocrypt/src/Makefile.am index 9ce083e9e56..0319fc6057b 100644 --- a/extra/yassl/taocrypt/src/Makefile.am +++ b/extra/yassl/taocrypt/src/Makefile.am @@ -11,5 +11,5 @@ libtaocrypt_a_SOURCES = aes.cpp aestables.cpp algebra.cpp arc4.cpp asn.cpp \ template_instnt.cpp libtaocrypt_a_LIBADD = libtaoint_a-integer.o -EXTRA_DIST = ../include/*.hpp +EXTRA_DIST = $(wildcard ../include/*.hpp) AM_CXXFLAGS = -DYASSL_PURE_C |