Browse Source

Switch automake handling to use --gnu mode, not --foreign.

Remove INSTALL file; automake generates a copy of the latest version.


git-svn-id: svn://svn.berlios.de/openocd/trunk@2435 b42882b7-edfa-0310-969c-e2dbd0fdcd60
tags/v0.2.0
zwelch 14 years ago
parent
commit
ef733b48e9
3 changed files with 4 additions and 4 deletions
  1. +0
    -1
      INSTALL
  2. +3
    -2
      Makefile.am
  3. +1
    -1
      bootstrap

+ 0
- 1
INSTALL View File

@@ -1 +0,0 @@
openocd.texi is the authoritative source of OpenOCD documentation

+ 3
- 2
Makefile.am View File

@@ -1,6 +1,6 @@
# not a GNU package. You can remove this line, if # not a GNU package. You can remove this line, if
# have all needed files, that a GNU package needs # have all needed files, that a GNU package needs
AUTOMAKE_OPTIONS = foreign 1.6
AUTOMAKE_OPTIONS = gnu 1.6


nobase_dist_pkgdata_DATA = \ nobase_dist_pkgdata_DATA = \
contrib/libdcc/dcc_stdio.c \ contrib/libdcc/dcc_stdio.c \
@@ -34,7 +34,7 @@ doxygen::


TCL_PATH = tcl TCL_PATH = tcl
# command to find paths of script files, relative to TCL_PATH # command to find paths of script files, relative to TCL_PATH
TCL_FILES := find $(srcdir)/$(TCL_PATH) -name '*.cfg' -o -name '*.tcl' | \
TCL_FILES = find $(srcdir)/$(TCL_PATH) -name '*.cfg' -o -name '*.tcl' | \
sed -e 's,^$(srcdir)/$(TCL_PATH),,' sed -e 's,^$(srcdir)/$(TCL_PATH),,'


dist-hook: dist-hook:
@@ -61,6 +61,7 @@ distclean-local:
DISTCLEANFILES = doxygen.log DISTCLEANFILES = doxygen.log


MAINTAINERCLEANFILES = \ MAINTAINERCLEANFILES = \
$(srcdir)/INSTALL \
$(srcdir)/configure \ $(srcdir)/configure \
$(srcdir)/Makefile.in \ $(srcdir)/Makefile.in \
$(srcdir)/depcomp \ $(srcdir)/depcomp \


+ 1
- 1
bootstrap View File

@@ -17,7 +17,7 @@ aclocal
${libtoolize} --automake --copy ${libtoolize} --automake --copy
autoconf autoconf
autoheader autoheader
automake --foreign --add-missing --copy
automake --gnu --add-missing --copy
) )


# AM_MAINTAINER_MODE requires SVN users provide --enable-maintainer-mode # AM_MAINTAINER_MODE requires SVN users provide --enable-maintainer-mode


Loading…
Cancel
Save