diff options
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | Makefile.am | 10 | ||||
-rw-r--r-- | configure.ac | 7 | ||||
-rw-r--r-- | mimetypes/Makefile.am | 4 | ||||
-rw-r--r-- | mimetypes/tests/.gitignore | 8 | ||||
-rw-r--r-- | mimetypes/tests/Makefile.am | 20 | ||||
-rw-r--r-- | src/.gitignore | 1 | ||||
-rw-r--r-- | src/Makefile.am | 8 | ||||
-rw-r--r-- | src/fileserv.8 (renamed from fileserv.8) | 0 | ||||
-rw-r--r-- | src/fileserv.c (renamed from fileserv.c) | 0 | ||||
-rw-r--r-- | src/fileserv.h (renamed from fileserv.h) | 0 | ||||
-rw-r--r-- | src/logger.c (renamed from logger.c) | 0 | ||||
-rw-r--r-- | src/pidfile.c (renamed from pidfile.c) | 0 | ||||
-rw-r--r-- | src/runas.c (renamed from runas.c) | 0 | ||||
-rw-r--r-- | src/wrapacl.c (renamed from wrapacl.c) | 0 |
15 files changed, 23 insertions, 36 deletions
@@ -15,7 +15,6 @@ config.status configure core depcomp -fileserv *.tar *.tar.* fileserv-0.1.tar.xz diff --git a/Makefile.am b/Makefile.am index cf663e3..fca9e2e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,10 +1,2 @@ -bin_PROGRAMS=fileserv -fileserv_SOURCES=fileserv.c runas.c fileserv.h logger.c pidfile.c -if FSRV_WRAP - fileserv_SOURCES += wrapacl.c -endif -dist_man_MANS=fileserv.8 EXTRA_DIST=README -SUBDIRS = . mimetypes -LDADD = ./mimetypes/libmimetypes.a -AM_CPPFLAGS = -I $(top_srcdir)/mimetypes +SUBDIRS = mimetypes src diff --git a/configure.ac b/configure.ac index f1b43ad..10bb7b0 100644 --- a/configure.ac +++ b/configure.ac @@ -15,8 +15,8 @@ # You should have received a copy of the GNU General Public License # along with fileserv. If not, see <http://www.gnu.org/licenses/>. -AC_INIT([fileserv], 0.2, [gray+fileserv@gnu.org.ua]) -AC_CONFIG_SRCDIR([fileserv.c]) +AC_INIT([fileserv], 0.2.90, [gray+fileserv@gnu.org.ua]) +AC_CONFIG_SRCDIR([src/fileserv.c]) AM_INIT_AUTOMAKE([1.11 foreign tar-ustar dist-xz silent-rules]) # Enable silent rules by default: AM_SILENT_RULES([yes]) @@ -43,9 +43,10 @@ AC_CHECK_LIB([wrap], [main]) AC_CHECK_LIB([nsl], [main]) AM_CONDITIONAL([FSRV_WRAP],[test x$ac_cv_lib_wrap_main = xyes]) +AM_MISSING_PROG([AUTOM4TE],[autom4te]) AC_CONFIG_TESTDIR([mimetypes/tests]) AC_CONFIG_FILES([mimetypes/tests/Makefile mimetypes/tests/atlocal]) -AC_CONFIG_FILES([Makefile mimetypes/Makefile]) +AC_CONFIG_FILES([Makefile mimetypes/Makefile src/Makefile]) AC_OUTPUT diff --git a/mimetypes/Makefile.am b/mimetypes/Makefile.am index 4b5d695..cdcb0f1 100644 --- a/mimetypes/Makefile.am +++ b/mimetypes/Makefile.am @@ -12,7 +12,7 @@ libmimetypes_a_SOURCES = \ locus.h\ prloc.c\ yyloc.h - +EXTRA_DIST=grammar.h AM_YFLAGS=-vtd AM_LEXFLAGS=-d - +SUBDIRS = . tests diff --git a/mimetypes/tests/.gitignore b/mimetypes/tests/.gitignore index 182f6aa..3a1a4eb 100644 --- a/mimetypes/tests/.gitignore +++ b/mimetypes/tests/.gitignore @@ -1,3 +1,5 @@ -atlocal -atconfig -mimetest +/atconfig +/atlocal +/mimetest +/package.m4 +/testsuite diff --git a/mimetypes/tests/Makefile.am b/mimetypes/tests/Makefile.am index fe48300..15666c5 100644 --- a/mimetypes/tests/Makefile.am +++ b/mimetypes/tests/Makefile.am @@ -1,19 +1,3 @@ -# This file is part of GNU Mailutils. -# Copyright (C) 2017 Free Software Foundation, Inc. -# -# GNU Mailutils is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 3, or (at -# your option) any later version. -# -# GNU Mailutils is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>. - EXTRA_DIST = $(TESTSUITE_AT) testsuite package.m4 DISTCLEANFILES = atconfig $(check_SCRIPTS) MAINTAINERCLEANFILES = Makefile.in $(TESTSUITE) @@ -37,7 +21,7 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac ## -------------------------- ## noinst_PROGRAMS = mimetest -AM_CPPFLAGS = -I .. +AM_CPPFLAGS = -I $(top_srcdir)/mimetypes LDADD = ../libmimetypes.a ## ------------ ## ## Test suite. ## @@ -49,7 +33,7 @@ TESTSUITE = $(srcdir)/testsuite M4=m4 AUTOTEST = $(AUTOM4TE) --language=autotest -$(TESTSUITE): package.m4 $(TESTSUITE_AT) $(top_srcdir)/testsuite/testsuite.inc +$(TESTSUITE): package.m4 $(TESTSUITE_AT) $(AM_V_GEN)$(AUTOTEST) -I $(srcdir) -I $(top_srcdir)/testsuite testsuite.at -o $@.tmp $(AM_V_at)mv $@.tmp $@ diff --git a/src/.gitignore b/src/.gitignore new file mode 100644 index 0000000..31a0273 --- /dev/null +++ b/src/.gitignore @@ -0,0 +1 @@ +fileserv diff --git a/src/Makefile.am b/src/Makefile.am new file mode 100644 index 0000000..b639e8b --- /dev/null +++ b/src/Makefile.am @@ -0,0 +1,8 @@ +bin_PROGRAMS=fileserv +fileserv_SOURCES=fileserv.c runas.c fileserv.h logger.c pidfile.c +if FSRV_WRAP + fileserv_SOURCES += wrapacl.c +endif +dist_man_MANS=fileserv.8 +LDADD = ../mimetypes/libmimetypes.a +AM_CPPFLAGS = -I $(top_srcdir)/mimetypes diff --git a/fileserv.8 b/src/fileserv.8 index 72c62a5..72c62a5 100644 --- a/fileserv.8 +++ b/src/fileserv.8 diff --git a/fileserv.c b/src/fileserv.c index b1e9aaf..b1e9aaf 100644 --- a/fileserv.c +++ b/src/fileserv.c diff --git a/fileserv.h b/src/fileserv.h index 924a2f8..924a2f8 100644 --- a/fileserv.h +++ b/src/fileserv.h diff --git a/pidfile.c b/src/pidfile.c index 5884747..5884747 100644 --- a/pidfile.c +++ b/src/pidfile.c diff --git a/wrapacl.c b/src/wrapacl.c index b515c13..b515c13 100644 --- a/wrapacl.c +++ b/src/wrapacl.c |