← Back to branch summary

~jlukas79/+junk/mysql-server

« back to all changes in this revision

Viewing changes to unittest/mysys/Makefile.am

manual merge 6.0-main --> 6.0-bka-review

Show diffs side-by-side

added added

removed removed

Lines of Context:
unittest/mysys/Makefile.am
13
13
# along with this program; if not, write to the Free Software
14
14
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
15
15
 
16
 
AM_CPPFLAGS      = @ZLIB_INCLUDES@ -I$(top_builddir)/include 
17
 
AM_CPPFLAGS     += -I$(top_srcdir)/include -I$(top_srcdir)/unittest/mytap
 
16
INCLUDES =              @ZLIB_INCLUDES@ -I$(top_builddir)/include \
 
17
                        -I$(top_srcdir)/include -I$(top_srcdir)/unittest/mytap 
 
18
 
 
19
noinst_PROGRAMS  =    bitmap-t base64-t my_atomic-t
18
20
 
19
21
LDADD           = $(top_builddir)/unittest/mytap/libmytap.a \
20
22
                  $(top_builddir)/mysys/libmysys.a \
21
23
                  $(top_builddir)/dbug/libdbug.a \
22
24
                  $(top_builddir)/strings/libmystrings.a
23
25
 
24
 
noinst_PROGRAMS  = bitmap-t base64-t my_atomic-t
 
26
EXTRA_DIST       = CMakeLists.txt 
25
27
 
26
28
EXTRA_DIST       = CMakeLists.txt 
27
29