capture information in changelog about bugs that this upload should close

[debian/amanda] / common-src / Makefile.am

diff --git a/common-src/Makefile.am b/common-src/Makefile.am
index 1d237ead48c7a89a7e5873650aada6b3155972ba..672eb190448ff175287acedd06e4ff46bd87cb89 100644 (file)
--- a/common-src/Makefile.am
+++ b/common-src/Makefile.am
@@ -1,48 +1,72 @@
 # Makefile for Amanda library.
 
+INCLUDES =      -I$(top_srcdir)/gnulib   
+
 lib_LTLIBRARIES =      libamanda.la
 
-REGDIR = ../regex-src
-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
-
-libamanda_la_LIBADD =  @LTLIBOBJS@ @LTALLOCA@
+LINT=@AMLINT@
+LINTFLAGS=@AMLINTFLAGS@
+
+libamanda_la_SOURCES =         \
+       alloc.c                 \
+       amfeatures.c            \
+       amflock.c               \
+       bsd-security.c          \
+       bsdtcp-security.c       \
+       bsdudp-security.c       \
+       clock.c                 \
+       conffile.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              \
+       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@
+
 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            \
+       arglist.h               \
+       clock.h                 \
+       conffile.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 +75,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
@@ -65,37 +89,13 @@ version.c:  genversion$(EXEEXT)
        -rm -f version.c
        ./genversion > version.c
 
-match.@OBJEXT@ match.lo: regex.h
-regcomp.@OBJEXT@ regcomp.lo: regex.h regcomp.ih
-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 \
-               $(REGsrcdir)/regfree.c
-
 # these are used for testing only:
 TEST_PROGS = statfs token file bsdsecurity amfeatures
 
-CLEANFILES = regex.h regcomp.ih engine.ih regerror.ih *.test.c
+CLEANFILES = *.test.c
 
 DISTCLEANFILES = version.c genversion.h genversion amanda-int.h
 
-regex.h: $(REGEXHSRC) $(REGsrcdir)/mkh
-       sh $(REGsrcdir)/mkh -o -i _REGEX_H_ $(REGEXHSRC) >$@
-
-regcomp.ih: $(REGsrcdir)/regcomp.c $(REGsrcdir)/mkh
-       sh $(REGsrcdir)/mkh -o -p $(REGsrcdir)/regcomp.c >$@
-
-engine.ih: $(REGsrcdir)/engine.c $(REGsrcdir)/mkh
-       sh $(REGsrcdir)/mkh -o -p $(REGsrcdir)/engine.c >$@
-
-regerror.ih: $(REGsrcdir)/regerror.c $(REGsrcdir)/mkh
-       sh $(REGsrcdir)/mkh -o -p $(REGsrcdir)/regerror.c >$@
-
 # used for testing only
 
 STANDARD_COMMON_STUFF_NOT_FILE = \
@@ -103,7 +103,9 @@ STANDARD_COMMON_STUFF_NOT_FILE = \
        clock.$(OBJEXT) \
        debug.$(OBJEXT) \
        error.$(OBJEXT) \
-       util.$(OBJEXT)
+       util.$(OBJEXT) \
+       match.$(OBJEXT) \
+       sl.$(OBJEXT)
 
 STANDARD_COMMON_STUFF = \
        $(STANDARD_COMMON_STUFF_NOT_FILE) \
@@ -135,6 +137,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 "$<"' >>$@