← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to Makefile.am

  • Committer: Thomi Richards
  • Date: 2010-10-30 00:42:01 UTC
  • mfrom: (1891 staging)
  • mto: This revision was merged to the branch mainline in revision 1894.
  • Revision ID: thomir@gmail.com-20101030004201-zxi50ffop5xlvzve
fixed merge conflict.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile.am
43
43
BUILT_MAINT_SRC=
44
44
EXTRA_DIST= \
45
45
            .quickly \
 
46
            ChangeLog \
46
47
            COPYING.Boost \
47
48
            COPYING.BSD \
48
49
            DRIZZLE.FAQ \
70
71
                        intltool-merge \
71
72
                        intltool-update
72
73
 
73
 
MAINTAINERCLEANFILES=   autom4te.cache
 
74
MAINTAINERCLEANFILES= \
 
75
                      autom4te.cache \
 
76
                      ChangeLog
74
77
 
75
78
EXTRA_LTLIBRARIES=
76
79
pkgplugin_LTLIBRARIES=
136
139
        find . -name '*.gcno' | xargs rm -f 
137
140
        -rm -rf docs/api docs/dev docs/_build docs/doctrees
138
141
 
 
142
ChangeLog:
 
143
        bzr log --gnu > ChangeLog
139
144
include config/lint-source.am
140
145
include config/lcov.am
141
146