← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/heap/Makefile.am

  • Committer: Brian Aker
  • Date: 2008-07-01 20:52:03 UTC
  • mfrom: (28.1.23 libtool-patch)
  • Revision ID: brian@tangent.org-20080701205203-3jm6ga57uzxy8k4t
Merge of taylor's work

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/heap/Makefile.am
17
17
MYSQLSHAREdir =         $(pkgdatadir)
18
18
MYSQLBASEdir=           $(prefix)
19
19
MYSQLLIBdir=            $(pkglibdir)
20
 
INCLUDES =              -I$(top_srcdir)/include -I$(top_builddir)/include \
 
20
AM_CPPFLAGS =              -I$(top_srcdir)/include -I$(top_builddir)/include \
21
21
                        -I$(top_srcdir)/regex \
22
22
                        -I$(top_srcdir)/sql \
23
23
                        -I$(srcdir)
31
31
noinst_LIBRARIES =      libheap.a
32
32
hp_test1_LDFLAGS = 
33
33
hp_test1_LDADD =        libheap.a \
34
 
                        $(top_builddir)/mysys/libmysys.a \
35
 
                        $(top_builddir)/dbug/libdbug.a \
36
 
                        $(top_builddir)/strings/libmystrings.a
 
34
                        $(top_builddir)/mysys/libmysyslt.la \
 
35
                        $(top_builddir)/dbug/libdbuglt.la \
 
36
                        $(top_builddir)/strings/libmystringslt.la
37
37
hp_test2_LDFLAGS = 
38
38
hp_test2_LDADD =        libheap.a \
39
 
                        $(top_builddir)/mysys/libmysys.a \
40
 
                        $(top_builddir)/dbug/libdbug.a \
41
 
                        $(top_builddir)/strings/libmystrings.a
 
39
                        $(top_builddir)/mysys/libmysyslt.la \
 
40
                        $(top_builddir)/dbug/libdbuglt.la \
 
41
                        $(top_builddir)/strings/libmystringslt.la
42
42
noinst_HEADERS =        heapdef.h ha_heap.h
43
43
libheap_a_SOURCES =     hp_open.c hp_extra.c hp_close.c hp_panic.c hp_info.c \
44
44
                        hp_rrnd.c hp_scan.c hp_update.c hp_write.c hp_delete.c \
51
51
 
52
52
EXTRA_DIST =            CMakeLists.txt plug.in
53
53
 
54
 
# Don't update the files from bitkeeper
55
 
%::SCCS/s.%