~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to Makefile.am

  • Committer: Monty Taylor
  • Author(s): Robert Collins
  • Date: 2009-11-03 20:51:31 UTC
  • mto: (1192.3.7 pandora-build)
  • mto: This revision was merged to the branch mainline in revision 1221.
  • Revision ID: mordred@inaugust.com-20091103205131-7hscp4y2iq8v5k1i
Merged buildsystem change from lifeless.

Show diffs side-by-side

added added

removed removed

Lines of Context:
32
32
 
33
33
BUILT_SOURCES=          drizzled/configmake.h
34
34
EXTRA_DIST=             config/config.rpath m4/gnulib-cache.m4 \
35
 
                        config/plugin.ac config/plugin.am \
36
35
                        config/autorun.sh Doxyfile \
37
36
                        extra/run_cpplint.sh  \
38
37
                        extra/cpplint.py \
193
192
 
194
193
EXTRA_LTLIBRARIES=
195
194
pkgplugin_LTLIBRARIES=
196
 
include config/plugin.am
 
195
include config/pandora-plugin.am
197
196
 
198
197
extra_my_print_defaults_SOURCES= extra/my_print_defaults.cc
199
198
extra_my_print_defaults_LDADD= \