Merge tag 'upstream/3.3.2'

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

diff --git a/common-src/Makefile.am b/common-src/Makefile.am
index d1686f1f27f9cabf736fb04aad861f8c19d666f4..40e2eb63c288ad2aed4b047a945e4d21270eefa2 100644 (file)
--- a/common-src/Makefile.am
+++ b/common-src/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/config/automake/scripts.am
 include $(top_srcdir)/config/automake/installperms.am
 include $(top_srcdir)/config/automake/precompile.am
 
-INCLUDES =      -I$(top_srcdir)/gnulib   
+INCLUDES =      -I$(top_srcdir)/gnulib
 
 AM_CFLAGS = $(AMANDA_WARNING_CFLAGS)
 AM_LDFLAGS = $(AMANDA_STATIC_LDFLAGS) $(AS_NEEDED_FLAGS)
@@ -19,6 +19,7 @@ LINTFLAGS=$(AMLINTFLAGS)
 
 libamanda_la_SOURCES =         \
        alloc.c                 \
+       am_sl.c                 \
        amfeatures.c            \
        amflock.c               \
        ipc-binary.c            \
@@ -40,7 +41,6 @@ libamanda_la_SOURCES =                \
        security.c              \
        security-util.c         \
        simpleprng.c            \
-       sl.c                    \
        sockaddr-util.c         \
        stream.c                \
        tapelist.c              \
@@ -123,7 +123,7 @@ noinst_HEADERS =            \
        security.h              \
        security-util.h         \
        simpleprng.h            \
-       sl.h                    \
+       am_sl.h                 \
        sockaddr-util.h         \
        stream.h                \
        tapelist.h              \