diff options
| author | Reuben Thomas <rrt@sc3d.org> | 2007-12-08 00:34:14 +0000 |
|---|---|---|
| committer | Reuben Thomas <rrt@sc3d.org> | 2007-12-08 00:34:14 +0000 |
| commit | 0c6735c74d1f8e2a150cd65129ff154293f9ebdb (patch) | |
| tree | 5993ac48552fcad0c9e3e5f7cc5935131bbb1dea | |
| parent | 0bb8fa7892f906e3c7db0c309876691fea1148d4 (diff) | |
| download | plptools-0c6735c74d1f8e2a150cd65129ff154293f9ebdb.tar.gz plptools-0c6735c74d1f8e2a150cd65129ff154293f9ebdb.tar.bz2 plptools-0c6735c74d1f8e2a150cd65129ff154293f9ebdb.zip | |
Move build files out of conf/.
Revert earlier change to Makefile.cvs to bring back aclocal; removed
in error.
| -rw-r--r-- | Makefile.am.in (renamed from conf/Makefile.am.in) | 2 | ||||
| -rw-r--r-- | Makefile.cvs | 14 | ||||
| -rw-r--r-- | configure.in.in (renamed from conf/configure.in.in) | 1 |
3 files changed, 10 insertions, 7 deletions
diff --git a/conf/Makefile.am.in b/Makefile.am.in index 490275e..4a6422f 100644 --- a/conf/Makefile.am.in +++ b/Makefile.am.in @@ -1,7 +1,7 @@ # $Id$ # -SUBDIRS = intl po lib ncpd plpnfsd plpftp plpprint sisinstall doc . +SUBDIRS = intl po lib ncpd plpnfsd plpfuse plpftp plpprint sisinstall doc . EXTRA_DIST = CHANGES COPYING README TODO HISTORY INSTALL ABOUT-NLS include/*.h* \ etc/*magic etc/*.in etc/*.c etc/psidump* etc/udev-usbserial-plptools.rules \ diff --git a/Makefile.cvs b/Makefile.cvs index 53da47c..6543091 100644 --- a/Makefile.cvs +++ b/Makefile.cvs @@ -1,8 +1,9 @@ -LIBTOOLFILES = conf/config.guess conf/config.sub conf/ltconfig conf/ltmain.sh -AUTOMAKEFILES = conf/mkinstalldirs conf/missing conf/install-sh +LIBTOOLFILES = config.guess config.sub ltconfig ltmain.sh +AUTOMAKEFILES = mkinstalldirs missing install-sh CONFIGHIN = include/config.h.in +ACLOCAL = aclocal.m4 GETTEXT = intl/Makefile.in -GETTEXTDEP = conf/Makefile.am.in conf/configure.in.in +GETTEXTDEP = Makefile.am.in configure.in.in all: @echo "Use make devel for development, make dist for distribution" @@ -33,6 +34,9 @@ htmldoc: man2html -H plptools.sourceforge.net -M "" $$f > $$o; \ done +$(ACLOCAL): + aclocal + $(CONFIGHIN): configure.in autoheader @@ -40,8 +44,8 @@ $(LIBTOOLFILES): libtoolize --force $(GETTEXT): $(GETTEXTDEP) - cp conf/configure.in.in configure.in - cp conf/Makefile.am.in Makefile.am + cp configure.in.in configure.in + cp Makefile.am.in Makefile.am mkdir -p intl echo n | gettextize --force --intl --no-changelog test -e po/Makevars || cp po/Makevars.template po/Makevars diff --git a/conf/configure.in.in b/configure.in.in index 479c7d6..05aca67 100644 --- a/conf/configure.in.in +++ b/configure.in.in @@ -2,7 +2,6 @@ AC_REVISION($Revision$)dnl revision of this configure.in script AC_INIT(Makefile.am) AC_GNU_SOURCE -AC_CONFIG_AUX_DIR(conf) AC_CANONICAL_SYSTEM AM_CONFIG_HEADER(include/config.h) AM_INIT_AUTOMAKE(plptools, 0.19) |