diff options
| author | James Youngman <jay@gnu.org> | 2011-06-12 01:06:33 +0100 |
|---|---|---|
| committer | James Youngman <jay@gnu.org> | 2011-06-12 03:24:03 +0100 |
| commit | f92ac3bc3fc089eaabd4dcc3fd16cb5cb0f23291 (patch) | |
| tree | 023b7d4d31fc7cf6780627848cb65f1ef3ce4edb | |
| parent | efe91834434e7d0fdd2c521f4d22dfdeccccda28 (diff) | |
| download | findutils-f92ac3bc3fc089eaabd4dcc3fd16cb5cb0f23291.tar.gz | |
Enable sc_makefile_at_at_check; fix problems it identifies.
* lib/Makefile.am: Use $(FINDLIBOBJS) instead of @FINDLIBOBJS@.
* find/Makefile.am (LDADD): Use $(FINDLIBS) instead of @FINDLIBS@.
* locate/Makefile.am (updatedb): Use $(VERSION) and
$(PACKAGE_NAME) instead of @VERSION@ and @PACKAGE_NAME@.
* cfg.mk: remove sc_makefile_at_at_check from local-checks-to-skip
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | cfg.mk | 3 | ||||
| -rw-r--r-- | find/Makefile.am | 2 | ||||
| -rw-r--r-- | lib/Makefile.am | 8 | ||||
| -rw-r--r-- | locate/Makefile.am | 4 |
5 files changed, 14 insertions, 12 deletions
@@ -1,5 +1,14 @@ 2011-06-12 James Youngman <jay@gnu.org> + Enable sc_makefile_at_at_check; fix problems it identifies. + * lib/Makefile.am: Use $(FINDLIBOBJS) instead of @FINDLIBOBJS@. + * find/Makefile.am (LDADD): Use $(FINDLIBS) instead of @FINDLIBS@. + * locate/Makefile.am (updatedb): Use $(VERSION) and + $(PACKAGE_NAME) instead of @VERSION@ and @PACKAGE_NAME@. + * cfg.mk: remove sc_makefile_at_at_check from local-checks-to-skip + +2011-06-12 James Youngman <jay@gnu.org> + Improve src-sniff.py. * build-aux/src-sniff.py: Mention that many of these checks would @@ -20,9 +20,6 @@ local-checks-to-skip := local-checks-to-skip += sc_error_message_period sc_error_message_uppercase \ sc_file_system -# Errors I have not investigated; diagnose and fix later. -local-checks-to-skip += sc_makefile_at_at_check - exclude_file_name_regexp--sc_obsolete_symbols = build-aux/src-sniff\.py exclude_file_name_regexp--sc_space_tab = \ xargs/testsuite/(inputs/.*\.xi|xargs.(gnu|posix|sysv)/.*\.xo)$$ diff --git a/find/Makefile.am b/find/Makefile.am index dce8bc5e..ba18731e 100644 --- a/find/Makefile.am +++ b/find/Makefile.am @@ -31,7 +31,7 @@ endif # man_MANS is not always the same, we want to distribute all of those files. EXTRA_DIST = defs.h sharefile.h find.1 ftsfind.1 oldfind.1 INCLUDES = -I../gl/lib -I$(top_srcdir)/lib -I$(top_srcdir)/gl/lib -I../intl -DLOCALEDIR=\"$(localedir)\" -LDADD = ./libfindtools.a ../lib/libfind.a ../gl/lib/libgnulib.a $(LIBINTL) $(LIB_CLOCK_GETTIME) $(LIB_EACCESS) $(LIB_SELINUX) $(LIB_CLOSE) $(MODF_LIBM) @FINDLIBS@ +LDADD = ./libfindtools.a ../lib/libfind.a ../gl/lib/libgnulib.a $(LIBINTL) $(LIB_CLOCK_GETTIME) $(LIB_EACCESS) $(LIB_SELINUX) $(LIB_CLOSE) $(MODF_LIBM) $(FINDLIBS) SUBDIRS = . testsuite #$(PROGRAMS): ../lib/libfind.a diff --git a/lib/Makefile.am b/lib/Makefile.am index 9aa578ea..f8ff625e 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -40,12 +40,8 @@ libfind_a_SOURCES += listfile.c nextelem.c extendbuf.c buildcmd.c savedirinfo.c EXTRA_DIST += waitpid.c forcefindlib.c TESTS_ENVIRONMENT = REGEXPROPS=regexprops$(EXEEXT) -libfind_a_LIBADD = @FINDLIBOBJS@ -libfind_a_DEPENDENCIES = @FINDLIBOBJS@ -# libfind_la_LIBADD = @LTFINDLIBOBJS@ - -# libfind_a_OBJECTS += @FINDLIBOBJS@ -# libfind_la_OBJECTS += @LTFINDLIBOBJS@ +libfind_a_LIBADD = $(FINDLIBOBJS) +libfind_a_DEPENDENCIES = $(FINDLIBOBJS) check-regexprops: check-regexprops.sh cp $(srcdir)/check-regexprops.sh check-regexprops diff --git a/locate/Makefile.am b/locate/Makefile.am index f8b71fb3..954a6961 100644 --- a/locate/Makefile.am +++ b/locate/Makefile.am @@ -39,8 +39,8 @@ updatedb: updatedb.sh Makefile -e "s,@""bindir""@,$(bindir)," \ -e "s,@""libexecdir""@,$(libexecdir)," \ -e "s,@""LOCATE_DB""@,$(LOCATE_DB)," \ - -e "s,@""VERSION""@,@VERSION@," \ - -e "s,@""PACKAGE_NAME""@,@PACKAGE_NAME@," \ + -e "s,@""VERSION""@,$(VERSION)," \ + -e "s,@""PACKAGE_NAME""@,$(PACKAGE_NAME)," \ -e "s,@""find""@,$${find}," \ -e "s,@""frcode""@,$${frcode}," \ -e "s,@""bigram""@,$${bigram}," \ |