← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to Makefile.am

  • Committer: Monty Taylor
  • Date: 2009-04-15 23:28:52 UTC
  • mto: (997.2.5 mordred)
  • mto: This revision was merged to the branch mainline in revision 994.
  • Revision ID: mordred@inaugust.com-20090415232852-f7npkf0zmv2ej9cb
Moved extra/ into root Makefile.am

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile.am
23
23
 
24
24
SUBDIRS = ${po} \
25
25
          gnulib \
 
26
          drizzled/message \
26
27
          . \
27
 
          extra \
28
28
          client \
29
 
          drizzled/message \
30
29
          storage \
31
30
          plugin \
32
31
          drizzled \
41
40
BUILT_SOURCES=          drizzled/configmake.h
42
41
noinst_LTLIBRARIES=     mysys/libmysys.la mystrings/libmystrings.la
43
42
 
 
43
nobase_bin_PROGRAMS= \
 
44
                extra/my_print_defaults \
 
45
                extra/mysql_waitpid \
 
46
                extra/innochecksum
 
47
 
44
48
noinst_HEADERS= \
45
49
                drizzled/configmake.h \
46
50
                mystrings/decimal.h \
149
153
                mysys/tree.cc \
150
154
                mysys/typelib.cc
151
155
 
 
156
extra_my_print_defaults_SOURCES= extra/my_print_defaults.cc
 
157
extra_my_print_defaults_LDADD= \
 
158
                $(top_builddir)/mysys/libmysys.la \
 
159
                $(top_builddir)/mystrings/libmystrings.la \
 
160
                $(LIBINTL)
 
161
extra_mysql_waitpid_SOURCES= extra/mysql_waitpid.cc
 
162
extra_mysql_waitpid_LDADD= \
 
163
                $(top_builddir)/mysys/libmysys.la \
 
164
                $(top_builddir)/mystrings/libmystrings.la \
 
165
                $(LIBINTL)
 
166
 
152
167
# Create empty datadir 
153
168
install-data-local:
154
169
        $(mkinstalldirs) $(DESTDIR)$(localstatedir)