X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=common-src%2FMakefile.am;h=7f25d62e856a929272840b8c3588bfe64949c96b;hb=refs%2Ftags%2Fupstream%2F2.5.1;hp=1d237ead48c7a89a7e5873650aada6b3155972ba;hpb=94c03cae686e4196a345d72452fda2a5203768ce;p=debian%2Famanda

diff --git a/common-src/Makefile.am b/common-src/Makefile.am
index 1d237ea..7f25d62 100644
--- a/common-src/Makefile.am
+++ b/common-src/Makefile.am
@@ -7,42 +7,71 @@ REGsrcdir = $(srcdir)/$(REGDIR)
 
 INCLUDES = -I$(REGsrcdir)
 
-libamanda_la_SOURCES = \
-	alloc.c		amflock.c	\
-	bsd-security.c	\
-	clock.c		\
-	debug.c		dgram.c		\
-	event.c		error.c		\
-	amfeatures.c	\
-	file.c		fileheader.c	\
-	krb4-security.c	krb5-security.c	\
-	match.c		\
-	packet.c	pipespawn.c	protocol.c	\
-	regcomp.c	regerror.c	regexec.c	regfree.c	\
-	rsh-security.c	\
-	security.c	sl.c		ssh-security.c	statfs.c	\
-	stream.c	tapelist.c	\
-	token.c		\
-	util.c		\
-	versuff.c	version.c
+LINT=@AMLINT@
+LINTFLAGS=@AMLINTFLAGS@
+
+libamanda_la_SOURCES =		\
+	alloc.c			\
+	amfeatures.c		\
+	amflock.c		\
+	bsd-security.c		\
+	bsdtcp-security.c	\
+	bsdudp-security.c	\
+	clock.c			\
+	debug.c			\
+	dgram.c			\
+	error.c			\
+	event.c			\
+	file.c			\
+	fileheader.c		\
+	krb4-security.c		\
+	krb5-security.c		\
+	match.c			\
+	packet.c		\
+	pipespawn.c		\
+	protocol.c		\
+	regcomp.c		\
+	regerror.c		\
+	regexec.c		\
+	regfree.c		\
+	rsh-security.c		\
+	security.c		\
+	security-util.c		\
+	sl.c			\
+	ssh-security.c		\
+	statfs.c		\
+	stream.c		\
+	tapelist.c		\
+	token.c			\
+	util.c			\
+	version.c		\
+	versuff.c
 
 libamanda_la_LIBADD =	@LTLIBOBJS@ @LTALLOCA@
 libamanda_la_LDFLAGS =  -release $(VERSION)
 
-noinst_HEADERS =	amanda.h	amregex.h	arglist.h	\
-			clock.h		\
-			dgram.h		\
-			event.h		\
-			amfeatures.h	\
-			packet.h	pipespawn.h	protocol.h	\
-			queue.h		\
-			sl.h		security.h	statfs.h	\
-			stream.h	\
-			tapelist.h	\
-			token.h		\
-			util.h		\
-			version.h	\
-			fileheader.h
+noinst_HEADERS =		\
+	amanda.h		\
+	amfeatures.h		\
+	amregex.h		\
+	arglist.h		\
+	clock.h			\
+	dgram.h			\
+	event.h			\
+	fileheader.h		\
+	packet.h		\
+	pipespawn.h		\
+	protocol.h		\
+	queue.h			\
+	security.h		\
+	security-util.h		\
+	sl.h			\
+	statfs.h		\
+	stream.h		\
+	tapelist.h		\
+	token.h			\
+	util.h			\
+	version.h
 
 .sh:
 	cat $< > $@
@@ -51,7 +80,7 @@ noinst_HEADERS =	amanda.h	amregex.h	arglist.h	\
 EXTRA_PROGRAMS = genversion $(TEST_PROGS)
 
 genversion_SOURCES = genversion.c
-genversion_LDADD = $(libamanda_la_LIBADD) versuff.o
+genversion_LDADD = $(libamanda_la_LIBADD) versuff.lo
 
 genversion.@OBJEXT@: genversion.h
 genversion.h: $(top_builddir)/config.status
@@ -71,12 +100,14 @@ regexec.@OBJEXT@ regexec.lo: regex.h engine.ih
 regerror.@OBJEXT@ regerror.lo: regex.h regerror.ih
 regfree.@OBJEXT@ regfree.lo: regex.h
 
-REGEXHSRC =	$(REGsrcdir)/regex2.h \
-		$(REGsrcdir)/regcomp.c \
-		$(REGsrcdir)/regexec.c \
-		$(REGsrcdir)/regerror.c \
+REGEXCSRC =	$(REGsrcdir)/regcomp.c	\
+		$(REGsrcdir)/regexec.c	\
+		$(REGsrcdir)/regerror.c	\
 		$(REGsrcdir)/regfree.c
 
+REGEXHSRC =	$(REGsrcdir)/regex2.h	\
+		$(REGEXCSRC)
+
 # these are used for testing only:
 TEST_PROGS = statfs token file bsdsecurity amfeatures
 
@@ -85,16 +116,16 @@ CLEANFILES = regex.h regcomp.ih engine.ih regerror.ih *.test.c
 DISTCLEANFILES = version.c genversion.h genversion amanda-int.h
 
 regex.h: $(REGEXHSRC) $(REGsrcdir)/mkh
-	sh $(REGsrcdir)/mkh -o -i _REGEX_H_ $(REGEXHSRC) >$@
+	sh $(REGsrcdir)/mkh -i _REGEX_H_ $(REGEXHSRC) >$@
 
 regcomp.ih: $(REGsrcdir)/regcomp.c $(REGsrcdir)/mkh
-	sh $(REGsrcdir)/mkh -o -p $(REGsrcdir)/regcomp.c >$@
+	sh $(REGsrcdir)/mkh -p $(REGsrcdir)/regcomp.c >$@
 
 engine.ih: $(REGsrcdir)/engine.c $(REGsrcdir)/mkh
-	sh $(REGsrcdir)/mkh -o -p $(REGsrcdir)/engine.c >$@
+	sh $(REGsrcdir)/mkh -p $(REGsrcdir)/engine.c >$@
 
 regerror.ih: $(REGsrcdir)/regerror.c $(REGsrcdir)/mkh
-	sh $(REGsrcdir)/mkh -o -p $(REGsrcdir)/regerror.c >$@
+	sh $(REGsrcdir)/mkh -p $(REGsrcdir)/regerror.c >$@
 
 # used for testing only
 
@@ -103,7 +134,8 @@ STANDARD_COMMON_STUFF_NOT_FILE = \
 	clock.$(OBJEXT) \
 	debug.$(OBJEXT) \
 	error.$(OBJEXT) \
-	util.$(OBJEXT)
+	util.$(OBJEXT) \
+	match.$(OBJEXT)
 
 STANDARD_COMMON_STUFF = \
 	$(STANDARD_COMMON_STUFF_NOT_FILE) \
@@ -135,6 +167,18 @@ bsdsecurity_LDADD = $(libamanda_a_LIBADD) \
 amfeatures_SOURCES = amfeatures.test.c
 amfeatures_LDADD = $(libamanda_la_LIBADD) $(STANDARD_COMMON_STUFF)
 
+lint:
+	@echo $(LINT) $(libamanda_la_SOURCES)
+	@$(LINT) $(LINTFLAGS) $(CPPFLAGS) $(DEFS) -I. -I../config $(INCLUDES) $(libamanda_la_SOURCES)
+	@echo $(LINT) $(genversion_SOURCES)
+	@$(LINT) $(LINTFLAGS) $(CPPFLAGS) $(DEFS) -I. -I../config $(INCLUDES) $(genversion_SOURCES)
+
+listlibsrc:
+	@ for p in $(libamanda_la_SOURCES) $(REGEXCSRC); do	\
+		listlibsrcs="$$listlibsrcs `pwd`/$$p";		\
+	done;							\
+	echo $$listlibsrcs >listlibsrc.output
+
 %.test.c: $(srcdir)/%.c
 	echo '#define TEST' >$@
 	echo '#include "$<"' >>$@