X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=changer-src%2FMakefile.am;h=abf0a126f2ad3495e2ca7d09a02e0ae24369243c;hb=d5853102f67d85d8e169f9dbe973ad573306c215;hp=8fa0c371c69832da8bac98c88f0493538e204422;hpb=94a044f90357edefa6f4ae9f0b1d5885b0e34aee;p=debian%2Famanda

diff --git a/changer-src/Makefile.am b/changer-src/Makefile.am
index 8fa0c37..abf0a12 100644
--- a/changer-src/Makefile.am
+++ b/changer-src/Makefile.am
@@ -7,7 +7,7 @@ include $(top_srcdir)/config/automake/precompile.am
 
 INCLUDES =	-I$(top_builddir)/common-src \
 		-I$(top_srcdir)/common-src   \
-		-I$(top_srcdir)/tape-src     \
+		-I$(top_srcdir)/device-src   \
 		-I$(top_srcdir)/gnulib
 
 AM_CFLAGS = $(AMANDA_WARNING_CFLAGS)
@@ -27,28 +27,25 @@ endif
 amlibexec_PROGRAMS =	$(CHG_SCSI)
 EXTRA_PROGRAMS =	$(CHIO_SCSI)
 
-CHECK_PERL = \
+SCRIPTS_PERL = \
 		chg-chio \
 		chg-iomega \
 		chg-rth
 
-SCRIPTS_PERL = $(CHECK_PERL)
-
 SCRIPTS_SHELL = \
 		chg-manual \
 		chg-multi \
 		chg-mtx \
 		chg-chs \
 		chg-zd-mtx \
-		chg-juke \
 		chg-rait \
 		chg-null \
+		chg-juke \
 		chg-mcutil \
 		chg-disk
 
 SCRIPTS_INCLUDE = \
 		chg-lib.sh
-
 EXTRA_DIST += chg-lib.sh.in
 
 amlibexec_SCRIPTS = $(SCRIPTS_PERL) $(SCRIPTS_SHELL)
@@ -62,8 +59,8 @@ amlibexec_DATA = $(SCRIPTS_INCLUDE)
 ###
 
 LDADD = ../common-src/libamanda.la \
-	../tape-src/libamtape.la \
 	../common-src/libamanda.la \
+	../device-src/libamdevice.la \
 	../gnulib/libgnu.la \
 	$(READLINE_LIBS)
 
@@ -115,13 +112,12 @@ INSTALLPERMS_data = \
 
 lint:
 	@ for p in $(amlibexec_PROGRAMS) $(EXTRA_PROGRAMS); do			\
+		p=`basename $$p $(EXEEXT)`;					\
 		f="$$p.c $(libamandad_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;						\