~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to Makefile.am

  • Committer: Eric Day
  • Date: 2010-03-25 19:28:37 UTC
  • mfrom: (1405 staging)
  • mto: This revision was merged to the branch mainline in revision 1409.
  • Revision ID: eday@oddments.org-20100325192837-4exmacbrywjovsqp
Merged trunk, rsolved conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
40
40
DIST_SUBDIRS = ${SUBDIRS} tests
41
41
 
42
42
BUILT_SOURCES=          drizzled/configmake.h
43
 
EXTRA_DIST=             config/config.rpath m4/gnulib-cache.m4 \
44
 
                        config/autorun.sh Doxyfile \
45
 
                        config/pandora_vc_revinfo \
46
 
                        extra/run_cpplint.sh  \
47
 
                        extra/cpplint.py \
48
 
                        extra/clean_source.sh \
49
 
                        config/make-lint.py
 
43
EXTRA_DIST= \
 
44
            Doxyfile \
 
45
            config/config.rpath \
 
46
            config/make-lint.py \
 
47
            config/pandora_vc_revinfo \
 
48
            extra/clean_source.sh \
 
49
            extra/cpplint.py \
 
50
            extra/run_cpplint.sh  \
 
51
            m4/gnulib-cache.m4
50
52
 
51
53
 
52
54
CLEANFILES=             ${BUILT_SOURCES}