capture information in changelog about bugs that this upload should close
[debian/amanda] / common-src / Makefile.am
index 87e12e9b5efcc510d5279bc0bda96a47eb06b90e..672eb190448ff175287acedd06e4ff46bd87cb89 100644 (file)
@@ -1,43 +1,72 @@
 # Makefile for Amanda library.
 
-lib_LTLIBRARIES =      libamanda.la
-
-REGDIR = ../regex-src
-REGsrcdir = $(srcdir)/$(REGDIR)
+INCLUDES =      -I$(top_srcdir)/gnulib   
 
-INCLUDES = -I$(REGsrcdir)
+lib_LTLIBRARIES =      libamanda.la
 
-libamanda_la_SOURCES = \
-       alloc.c         amflock.c       clock.c         debug.c         \
-       dgram.c         error.c         file.c          fileheader.c    \
-       amfeatures.c    match.c                                         \
-       protocol.c      regcomp.c       regerror.c      regexec.c       \
-       regfree.c       security.c      statfs.c        stream.c        \
-       token.c         util.c          versuff.c       version.c       \
-        pipespawn.c    sl.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                 \
+       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_LIBADD =  @LTLIBOBJS@ @LTALLOCA@
 libamanda_la_LDFLAGS =  -release $(VERSION)
 
-noinst_HEADERS =       amanda.h        arglist.h       \
-                       clock.h         dgram.h         \
-                       amfeatures.h    protocol.h      \
-                       statfs.h        stream.h        \
-                       token.h         version.h       \
-                       amregex.h       fileheader.h    \
-                       util.h          pipespawn.h     \
-                       sl.h
-
-STANDARD_COMMON_STUFF_NOT_FILE = \
-       alloc.$(OBJEXT) \
-       clock.$(OBJEXT) \
-       debug.$(OBJEXT) \
-       error.$(OBJEXT) \
-       util.$(OBJEXT)
-
-STANDARD_COMMON_STUFF = \
-       $(STANDARD_COMMON_STUFF_NOT_FILE) \
-       file.$(OBJEXT)
+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 $< > $@
@@ -45,12 +74,10 @@ STANDARD_COMMON_STUFF = \
 
 EXTRA_PROGRAMS = genversion $(TEST_PROGS)
 
-EXTRA_DIST = krb4-security.c   krb4-security.h
-
 genversion_SOURCES = genversion.c
-genversion_LDADD = $(libamanda_la_LIBADD) $(STANDARD_COMMON_STUFF) versuff.o
+genversion_LDADD = $(libamanda_la_LIBADD) versuff.lo
 
-genversion.o: genversion.h
+genversion.@OBJEXT@: genversion.h
 genversion.h: $(top_builddir)/config.status
        -rm -f $@ $@.new
        echo '#define CC "$(CC)"' > $@.new
@@ -62,38 +89,27 @@ 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 security amfeatures
-
-CLEANFILES = regex.h regcomp.ih engine.ih regerror.ih *.test.c
+TEST_PROGS = statfs token file bsdsecurity amfeatures
 
-DISTCLEANFILES = version.c genversion
+CLEANFILES = *.test.c
 
-regex.h: $(REGEXHSRC) $(REGsrcdir)/mkh
-       sh $(REGsrcdir)/mkh -o -i _REGEX_H_ $(REGEXHSRC) >$@
+DISTCLEANFILES = version.c genversion.h genversion amanda-int.h
 
-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 >$@
+# used for testing only
 
-regerror.ih: $(REGsrcdir)/regerror.c $(REGsrcdir)/mkh
-       sh $(REGsrcdir)/mkh -o -p $(REGsrcdir)/regerror.c >$@
+STANDARD_COMMON_STUFF_NOT_FILE = \
+       alloc.$(OBJEXT) \
+       clock.$(OBJEXT) \
+       debug.$(OBJEXT) \
+       error.$(OBJEXT) \
+       util.$(OBJEXT) \
+       match.$(OBJEXT) \
+       sl.$(OBJEXT)
 
-# used for testing only
+STANDARD_COMMON_STUFF = \
+       $(STANDARD_COMMON_STUFF_NOT_FILE) \
+       file.$(OBJEXT)
 
 statfs_SOURCES = statfs.test.c
 statfs_LDADD = $(libamanda_la_LIBADD) $(STANDARD_COMMON_STUFF)
@@ -104,12 +120,35 @@ token_LDADD = $(libamanda_la_LIBADD) $(STANDARD_COMMON_STUFF)
 file_SOURCES = file.test.c
 file_LDADD = $(libamanda_la_LIBADD) $(STANDARD_COMMON_STUFF_NOT_FILE)
 
-security_SOURCES = security.test.c
-security_LDADD = $(libamanda_la_LIBADD) $(STANDARD_COMMON_STUFF)
+bsdsecurity_SOURCES = bsd-security.test.c
+bsdsecurity_LDADD = $(libamanda_a_LIBADD) \
+                   alloc.$(OBJEXT) \
+                   clock.$(OBJEXT) \
+                   debug.$(OBJEXT) \
+                   dgram.$(OBJEXT) \
+                   error.$(OBJEXT) \
+                   event.$(OBJEXT) \
+                   file.$(OBJEXT) \
+                   packet.$(OBJEXT) \
+                   security.$(OBJEXT) \
+                   ssh-security.$(OBJEXT) \
+                   versuff.$(OBJEXT)
 
 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 "$<"' >>$@