X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=restore-src%2FMakefile.am;h=26ee41521ac4cad9f372fd3f7475aa645ac501b7;hb=2627875b7d18858bc1f9f7652811e4d8c15a23eb;hp=fa14e255f8c95bd6e662449e034079ae600b8c6c;hpb=fb2bd066c2f8b34addafe48d62550e3033a59431;p=debian%2Famanda

diff --git a/restore-src/Makefile.am b/restore-src/Makefile.am
index fa14e25..26ee415 100644
--- a/restore-src/Makefile.am
+++ b/restore-src/Makefile.am
@@ -1,5 +1,6 @@
 # Makefile for Amanda restore programs.
 
+include $(top_srcdir)/config/automake/vars.am
 include $(top_srcdir)/config/automake/installperms.am
 include $(top_srcdir)/config/automake/precompile.am
 
@@ -13,8 +14,8 @@ INCLUDES =	-I$(top_builddir)/common-src \
 AM_CFLAGS = $(AMANDA_WARNING_CFLAGS)
 AM_LDFLAGS = $(AMANDA_STATIC_LDFLAGS)
 
-LINT=@AMLINT@
-LINTFLAGS=@AMLINTFLAGS@
+LINT=$(AMLINT)
+LINTFLAGS=$(AMLINTFLAGS)
 
 amlib_LTLIBRARIES =	librestore.la
 LIB_EXTENSION = la
@@ -32,7 +33,6 @@ amlibexec_PROGRAMS = 	amidxtaped
 
 LDADD = librestore.$(LIB_EXTENSION)              \
       ../common-src/libamanda.$(LIB_EXTENSION) \
-      ../gnulib/libgnu.$(LIB_EXTENSION) \
       $(READLINE_LIBS)
 
 amidxtaped_LDADD = $(LDADD) \
@@ -57,13 +57,12 @@ INSTALLPERMS_exec = \
 
 lint:
 	@ for p in $(amlibexec_PROGRAMS) $(sbin_PROGRAMS); do			\
+		p=`basename $$p $(EXEEXT)`;					\
 		f="$$p.c $(librestore_la_SOURCES)";				\
 		(cd ../common-src; make listlibsrc);				\
 		f="$$f "`cat ../common-src/listlibsrc.output`;			\
 		(cd ../server-src; make listlibsrc);				\
 		f="$$f "`cat ../server-src/listlibsrc.output`;			\
-		(cd ../tape-src; make listlibsrc);				\
-		f="$$f "`cat ../tape-src/listlibsrc.output`;			\
 		echo $(LINT) $$f;						\
 		$(LINT) $(LINTFLAGS) $(CPPFLAGS) $(DEFS) -I. -I$(top_builddir)/config	\
 		    $(INCLUDES) $$f;						\