X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=client-src%2FMakefile.in;h=f30f2aca84d6443eef7c2c0cb43c7b5df666e7a3;hb=refs%2Ftags%2Fupstream%2F2.5.1;hp=aa86788f6e5081aa697adf9d9aa2a871cdd3f6d5;hpb=94c03cae686e4196a345d72452fda2a5203768ce;p=debian%2Famanda

diff --git a/client-src/Makefile.in b/client-src/Makefile.in
index aa86788..f30f2ac 100644
--- a/client-src/Makefile.in
+++ b/client-src/Makefile.in
@@ -42,11 +42,9 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
-libexec_PROGRAMS = amandad$(EXEEXT) noop$(EXEEXT) calcsize$(EXEEXT) \
-	killpgrp$(EXEEXT) rundump$(EXEEXT) runtar$(EXEEXT) \
-	selfcheck$(EXEEXT) sendbackup$(EXEEXT) sendsize$(EXEEXT) \
-	versionsuffix$(EXEEXT)
-@WANT_SERVER_TRUE@am__append_1 = ../tape-src/libamtape.$(LIB_EXTENSION)
+libexec_PROGRAMS = noop$(EXEEXT) calcsize$(EXEEXT) killpgrp$(EXEEXT) \
+	rundump$(EXEEXT) runtar$(EXEEXT) selfcheck$(EXEEXT) \
+	sendbackup$(EXEEXT) sendsize$(EXEEXT) versionsuffix$(EXEEXT)
 EXTRA_PROGRAMS = $(am__EXEEXT_1)
 subdir = client-src
 DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
@@ -71,82 +69,84 @@ libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
 libamclient_la_LIBADD =
 am__libamclient_la_SOURCES_DIST = amandates.c getfsent.c unctime.c \
-	client_util.c findpass.c
+	client_util.c clientconf.c findpass.c
 @WANT_SAMBA_TRUE@am__objects_1 = findpass.lo
 am_libamclient_la_OBJECTS = amandates.lo getfsent.lo unctime.lo \
-	client_util.lo $(am__objects_1)
+	client_util.lo clientconf.lo $(am__objects_1)
 libamclient_la_OBJECTS = $(am_libamclient_la_OBJECTS)
 am__EXEEXT_1 = getfsent$(EXEEXT)
 libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(libexec_PROGRAMS)
-amandad_SOURCES = amandad.c
-amandad_OBJECTS = amandad.$(OBJEXT)
-amandad_LDADD = $(LDADD)
-@WANT_SERVER_TRUE@am__DEPENDENCIES_1 =  \
-@WANT_SERVER_TRUE@	../tape-src/libamtape.$(LIB_EXTENSION)
-amandad_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
-	libamclient.$(LIB_EXTENSION) $(am__DEPENDENCIES_1) \
-	../common-src/libamanda.$(LIB_EXTENSION)
 calcsize_SOURCES = calcsize.c
 calcsize_OBJECTS = calcsize.$(OBJEXT)
 calcsize_LDADD = $(LDADD)
 calcsize_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
-	libamclient.$(LIB_EXTENSION) $(am__DEPENDENCIES_1) \
+	libamclient.$(LIB_EXTENSION) \
+	../amandad-src/libamandad.$(LIB_EXTENSION) \
 	../common-src/libamanda.$(LIB_EXTENSION)
 am_getfsent_OBJECTS = getfsent.test.$(OBJEXT)
 getfsent_OBJECTS = $(am_getfsent_OBJECTS)
 getfsent_LDADD = $(LDADD)
 getfsent_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
-	libamclient.$(LIB_EXTENSION) $(am__DEPENDENCIES_1) \
+	libamclient.$(LIB_EXTENSION) \
+	../amandad-src/libamandad.$(LIB_EXTENSION) \
 	../common-src/libamanda.$(LIB_EXTENSION)
 killpgrp_SOURCES = killpgrp.c
 killpgrp_OBJECTS = killpgrp.$(OBJEXT)
 killpgrp_LDADD = $(LDADD)
 killpgrp_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
-	libamclient.$(LIB_EXTENSION) $(am__DEPENDENCIES_1) \
+	libamclient.$(LIB_EXTENSION) \
+	../amandad-src/libamandad.$(LIB_EXTENSION) \
 	../common-src/libamanda.$(LIB_EXTENSION)
 noop_SOURCES = noop.c
 noop_OBJECTS = noop.$(OBJEXT)
 noop_LDADD = $(LDADD)
 noop_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
-	libamclient.$(LIB_EXTENSION) $(am__DEPENDENCIES_1) \
+	libamclient.$(LIB_EXTENSION) \
+	../amandad-src/libamandad.$(LIB_EXTENSION) \
 	../common-src/libamanda.$(LIB_EXTENSION)
 rundump_SOURCES = rundump.c
 rundump_OBJECTS = rundump.$(OBJEXT)
 rundump_LDADD = $(LDADD)
 rundump_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
-	libamclient.$(LIB_EXTENSION) $(am__DEPENDENCIES_1) \
+	libamclient.$(LIB_EXTENSION) \
+	../amandad-src/libamandad.$(LIB_EXTENSION) \
 	../common-src/libamanda.$(LIB_EXTENSION)
 runtar_SOURCES = runtar.c
 runtar_OBJECTS = runtar.$(OBJEXT)
 runtar_LDADD = $(LDADD)
 runtar_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
-	libamclient.$(LIB_EXTENSION) $(am__DEPENDENCIES_1) \
+	libamclient.$(LIB_EXTENSION) \
+	../amandad-src/libamandad.$(LIB_EXTENSION) \
 	../common-src/libamanda.$(LIB_EXTENSION)
 selfcheck_SOURCES = selfcheck.c
 selfcheck_OBJECTS = selfcheck.$(OBJEXT)
 selfcheck_LDADD = $(LDADD)
 selfcheck_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
-	libamclient.$(LIB_EXTENSION) $(am__DEPENDENCIES_1) \
+	libamclient.$(LIB_EXTENSION) \
+	../amandad-src/libamandad.$(LIB_EXTENSION) \
 	../common-src/libamanda.$(LIB_EXTENSION)
 am_sendbackup_OBJECTS = sendbackup.$(OBJEXT) sendbackup-dump.$(OBJEXT) \
 	sendbackup-gnutar.$(OBJEXT)
 sendbackup_OBJECTS = $(am_sendbackup_OBJECTS)
 sendbackup_LDADD = $(LDADD)
 sendbackup_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
-	libamclient.$(LIB_EXTENSION) $(am__DEPENDENCIES_1) \
+	libamclient.$(LIB_EXTENSION) \
+	../amandad-src/libamandad.$(LIB_EXTENSION) \
 	../common-src/libamanda.$(LIB_EXTENSION)
 sendsize_SOURCES = sendsize.c
 sendsize_OBJECTS = sendsize.$(OBJEXT)
 sendsize_LDADD = $(LDADD)
 sendsize_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
-	libamclient.$(LIB_EXTENSION) $(am__DEPENDENCIES_1) \
+	libamclient.$(LIB_EXTENSION) \
+	../amandad-src/libamandad.$(LIB_EXTENSION) \
 	../common-src/libamanda.$(LIB_EXTENSION)
 versionsuffix_SOURCES = versionsuffix.c
 versionsuffix_OBJECTS = versionsuffix.$(OBJEXT)
 versionsuffix_LDADD = $(LDADD)
 versionsuffix_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
-	libamclient.$(LIB_EXTENSION) $(am__DEPENDENCIES_1) \
+	libamclient.$(LIB_EXTENSION) \
+	../amandad-src/libamandad.$(LIB_EXTENSION) \
 	../common-src/libamanda.$(LIB_EXTENSION)
 libexecSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 sbinSCRIPT_INSTALL = $(INSTALL_SCRIPT)
@@ -162,10 +162,10 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
 CCLD = $(CC)
 LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libamclient_la_SOURCES) amandad.c calcsize.c \
-	$(getfsent_SOURCES) killpgrp.c noop.c rundump.c runtar.c \
-	selfcheck.c $(sendbackup_SOURCES) sendsize.c versionsuffix.c
-DIST_SOURCES = $(am__libamclient_la_SOURCES_DIST) amandad.c calcsize.c \
+SOURCES = $(libamclient_la_SOURCES) calcsize.c $(getfsent_SOURCES) \
+	killpgrp.c noop.c rundump.c runtar.c selfcheck.c \
+	$(sendbackup_SOURCES) sendsize.c versionsuffix.c
+DIST_SOURCES = $(am__libamclient_la_SOURCES_DIST) calcsize.c \
 	$(getfsent_SOURCES) killpgrp.c noop.c rundump.c runtar.c \
 	selfcheck.c $(sendbackup_SOURCES) sendsize.c versionsuffix.c
 HEADERS = $(noinst_HEADERS)
@@ -179,11 +179,14 @@ AMANDA_DEBUG_DAYS = @AMANDA_DEBUG_DAYS@
 AMANDA_TMPDIR = @AMANDA_TMPDIR@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
+AMLINT = @AMLINT@
+AMLINTFLAGS = @AMLINTFLAGS@
 AMPLOT_CAT_COMPRESS = @AMPLOT_CAT_COMPRESS@
 AMPLOT_CAT_GZIP = @AMPLOT_CAT_GZIP@
 AMPLOT_CAT_PACK = @AMPLOT_CAT_PACK@
 AMPLOT_COMPRESS = @AMPLOT_COMPRESS@
 AMTAR = @AMTAR@
+AM_CFLAGS = @AM_CFLAGS@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -191,6 +194,8 @@ AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 AWK_VAR_ASSIGNMENT_OPT = @AWK_VAR_ASSIGNMENT_OPT@
 BINARY_OWNER = @BINARY_OWNER@
+BUILD_MAN_PAGES_FALSE = @BUILD_MAN_PAGES_FALSE@
+BUILD_MAN_PAGES_TRUE = @BUILD_MAN_PAGES_TRUE@
 CAT = @CAT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -372,8 +377,11 @@ target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
 INCLUDES = -I$(top_builddir)/common-src \
-		-I$(top_srcdir)/common-src
+		-I$(top_srcdir)/common-src \
+		-I$(top_srcdir)/amandad-src
 
+LINT = @AMLINT@
+LINTFLAGS = @AMLINTFLAGS@
 lib_LTLIBRARIES = libamclient.la
 LIB_EXTENSION = la
 sbin_SCRIPTS = @CLIENT_SCRIPTS_OPT@
@@ -382,7 +390,7 @@ libexec_SCRIPTS = patch-system
 @WANT_RUNTIME_PSEUDO_RELOC_TRUE@AM_LDFLAGS = -Wl,-enable-runtime-pseudo-reloc
 libamclient_la_SOURCES = amandates.c		getfsent.c	\
 			unctime.c		client_util.c	\
-			$(samba_sources)
+			clientconf.c		$(samba_sources)
 
 libamclient_la_LDFLAGS = -release $(VERSION)
 
@@ -393,8 +401,10 @@ libamclient_la_LDFLAGS = -release $(VERSION)
 # routines, and second to pick up any references in the other libraries.
 ###
 LDADD = ../common-src/libamanda.$(LIB_EXTENSION) \
-	libamclient.$(LIB_EXTENSION) $(am__append_1) \
+	libamclient.$(LIB_EXTENSION) \
+	../amandad-src/libamandad.$(LIB_EXTENSION) \
 	../common-src/libamanda.$(LIB_EXTENSION)
+
 SUFFIXES = .sh .pl
 
 # these are used for testing only:
@@ -403,11 +413,12 @@ CLEANFILES = *.test.c patch-system
 EXTRA_SCRIPTS = amhpfixdevs		amsinixfixdevs
 DISTCLEANFILES = $(EXTRA_SCRIPTS)
 EXTRA_DIST = amhpfixdevs.sh		amsinixfixdevs.sh
-sendbackup_SOURCES = sendbackup.c		sendbackup.h	\
+sendbackup_SOURCES = sendbackup.c		sendbackup.h	  \
 			sendbackup-dump.c	sendbackup-gnutar.c
 
-noinst_HEADERS = amandad.h	amandates.h	getfsent.h	\
-			findpass.h	client_util.h
+noinst_HEADERS = amandates.h	getfsent.h	\
+			findpass.h	client_util.h	\
+			clientconf.h
 
 getfsent_SOURCES = getfsent.test.c
 all: all-am
@@ -502,9 +513,6 @@ clean-libexecPROGRAMS:
 	  echo " rm -f $$p $$f"; \
 	  rm -f $$p $$f ; \
 	done
-amandad$(EXEEXT): $(amandad_OBJECTS) $(amandad_DEPENDENCIES) 
-	@rm -f amandad$(EXEEXT)
-	$(LINK) $(amandad_LDFLAGS) $(amandad_OBJECTS) $(amandad_LDADD) $(LIBS)
 calcsize$(EXEEXT): $(calcsize_OBJECTS) $(calcsize_DEPENDENCIES) 
 	@rm -f calcsize$(EXEEXT)
 	$(LINK) $(calcsize_LDFLAGS) $(calcsize_OBJECTS) $(calcsize_LDADD) $(LIBS)
@@ -580,10 +588,10 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amandad.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amandates.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/calcsize.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/client_util.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clientconf.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/findpass.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getfsent.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getfsent.test.Po@am__quote@
@@ -849,6 +857,20 @@ install-exec-hook:
 @WANT_SETUID_CLIENT_TRUE@		fi; \
 @WANT_SETUID_CLIENT_TRUE@	done
 
+lint:
+	@ for p in $(libexec_PROGRAMS); do					\
+		f="$$p.c $(libamclient_la_SOURCES)";				\
+		(cd ../common-src; make listlibsrc);				\
+		f="$$f "`cat ../common-src/listlibsrc.output`;			\
+		echo $(LINT) $$f;						\
+		$(LINT) $(LINTFLAGS) $(CPPFLAGS) $(DEFS) -I. -I../config	\
+		    $(INCLUDES) $$f;						\
+		if [ $$? -ne 0 ]; then						\
+		    exit 1;							\
+		fi;								\
+	done;									\
+        exit 0
+
 %.test.c: $(srcdir)/%.c
 	echo '#define TEST' >$@
 	echo '#include "$<"' >>$@