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
This commit is contained in:
James Youngman
2011-06-12 01:06:33 +01:00
parent efe9183443
commit f92ac3bc3f
5 changed files with 14 additions and 12 deletions

View File

@@ -1,3 +1,12 @@
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.

3
cfg.mk
View File

@@ -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)$$

View File

@@ -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

View File

@@ -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

View File

@@ -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}," \