← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to extra/Makefile.am

Merged with trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
extra/Makefile.am
15
15
 
16
16
INCLUDES =              -I$(top_builddir)/include -I$(top_srcdir)/include \
17
17
                        -I$(top_srcdir)/sql
18
 
LDADD =                 ../mysys/libmysys.a \
19
 
                        ../dbug/libdbug.a ../strings/libmystrings.a \
 
18
LDADD =                 $(top_builddir)/mysys/libmysyslt.la \
 
19
                        $(top_builddir)/dbug/libdbuglt.la \
 
20
                        $(top_builddir)/strings/libmystringslt.la \
20
21
                        -lz
 
22
 
21
23
BUILT_SOURCES=          $(top_builddir)/include/mysqld_error.h \
22
24
                        $(top_builddir)/include/sql_state.h \
23
25
                        $(top_builddir)/include/mysqld_ername.h
47
49
noinst_PROGRAMS =       
48
50
EXTRA_PROGRAMS =        comp_err
49
51
EXTRA_DIST =            CMakeLists.txt
50
 
 
51
 
# Don't update the files from bitkeeper
52
 
%::SCCS/s.%