- Fix ANSI labels to put EOF1 and EOF2 after each file mark.

[bacula/bacula] / bacula / src / filed / Makefile.in

diff --git a/bacula/src/filed/Makefile.in b/bacula/src/filed/Makefile.in
index 965f1a18329ae876d0ee5a7183e39acb3d4a35fc..3b0efbb5b9d1b1a950e728dd4c2494397cf659c6 100755 (executable)
--- a/bacula/src/filed/Makefile.in
+++ b/bacula/src/filed/Makefile.in
@@ -23,11 +23,11 @@ first_rule: all
 dummy:
 
 #
-SVRSRCS = filed.c authenticate.c backup.c estimate.c \
-         filed_conf.c heartbeat.c job.c \
+SVRSRCS = filed.c authenticate.c acl.c backup.c chksum.c estimate.c \
+         filed_conf.c heartbeat.c job.c python.c \
          restore.c status.c verify.c verify_vol.c
-SVROBJS = filed.o authenticate.o backup.o estimate.o \
-         filed_conf.o heartbeat.o job.o \
+SVROBJS = filed.o authenticate.o acl.o backup.o chksum.o estimate.o \
+         filed_conf.o heartbeat.o job.o python.o \
          restore.o status.o verify.o verify_vol.o
 
 # these are the objects that are changed by the .configure process
@@ -47,7 +47,7 @@ WIN32LIBS = $(@WIN32@)
 
 # inference rules
 .c.o:
-       $(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
+       $(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) $(PYTHON_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
 #-------------------------------------------------------------------------
 all: Makefile @WIN32@ bacula-fd @STATIC_FD@
        @echo "==== Make of filed is good ===="
@@ -72,11 +72,11 @@ win32:      $(WIN32OBJS)
 
 bacula-fd:  $(SVROBJS) ../findlib/libfind.a ../lib/libbac.a @WIN32@
        $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \
-         $(WIN32LIBS) $(FDLIBS) -lfind -lbac -lm $(LIBS) $(DLIB)
+         $(WIN32LIBS) $(FDLIBS) -lfind -lbac -lm $(PYTHON_LIBS) $(LIBS) $(DLIB)
 
 static-bacula-fd:  $(SVROBJS) ../findlib/libfind.a ../lib/libbac.a @WIN32@
        $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \
-          $(WIN32LIBS) $(FDLIBS) -lfind -lbac -lm $(LIBS) $(DLIB)
+          $(WIN32LIBS) $(FDLIBS) -lfind -lbac -lm $(PYTHON_LIBS) $(LIBS) $(DLIB)
        strip $@
 
 
@@ -101,6 +101,13 @@ distclean: realclean
           (cd win32; $(MAKE) distclean); \
        fi
 
+devclean: realclean
+       if test $(srcdir) = .; then $(MAKE) realclean; fi
+       (cd $(srcdir); $(RMF) Makefile)
+       if test -f win32/Makefile; then \
+          (cd win32; $(MAKE) devclean); \
+       fi
+
 install: all
        $(INSTALL_PROGRAM) bacula-fd $(DESTDIR)$(sbindir)/bacula-fd 
        @srcconf=bacula-fd.conf; \
@@ -134,7 +141,7 @@ depend:
        @$(MV) Makefile Makefile.bak
        @$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile
        @$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile
-       @$(CC) -S -M $(CPPFLAGS) $(XINC) -I$(srcdir) -I$(basedir) $(SQL_INC) *.c >> Makefile
+       @$(CXX) -S -M $(CPPFLAGS) $(XINC) -I$(srcdir) -I$(basedir) $(SQL_INC) *.c >> Makefile
        @if test -f Makefile ; then \
            $(RMF) Makefile.bak; \
        else \