X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Ffiled%2FMakefile.in;h=2e7304319c2086db86b75202ebe7e3b42d2fd6b7;hb=6e637fce30a1fdbc2da43552f513f529db4d4e87;hp=bd50d310bfd81357f7b76b04db29d07053df956f;hpb=27b7ba72d3a927ccbb3feaf7ee7895272c0d4dcc;p=bacula%2Fbacula

diff --git a/bacula/src/filed/Makefile.in b/bacula/src/filed/Makefile.in
old mode 100755
new mode 100644
index bd50d310bf..2e7304319c
--- a/bacula/src/filed/Makefile.in
+++ b/bacula/src/filed/Makefile.in
@@ -19,8 +19,7 @@ thisdir = src/filed
 
 DEBUG=@DEBUG@
 
-OPENSSL_LIBS = @OPENSSL_LIBS@
-OPENSSL_INC = @OPENSSL_INC@
+GETTEXT_LIBS = @LIBINTL@
 
 PYTHON_LIBS = @PYTHON_LIBS@
 PYTHON_INC = @PYTHON_INCDIR@
@@ -29,11 +28,13 @@ first_rule: all
 dummy:
 
 #
-SVRSRCS = filed.c authenticate.c acl.c backup.c chksum.c estimate.c \
-	  filed_conf.c heartbeat.c job.c python.c \
+SVRSRCS = filed.c authenticate.c acl.c backup.c estimate.c \
+	  fd_plugins.c accurate.c \
+	  filed_conf.c heartbeat.c job.c pythonfd.c \
 	  restore.c status.c verify.c verify_vol.c
-SVROBJS = filed.o authenticate.o acl.o backup.o chksum.o estimate.o \
-	  filed_conf.o heartbeat.o job.o python.o \
+SVROBJS = filed.o authenticate.o acl.o backup.o estimate.o \
+	  fd_plugins.o accurate.o \
+	  filed_conf.o heartbeat.o job.o pythonfd.o \
 	  restore.o status.o verify.o verify_vol.o
 
 # these are the objects that are changed by the .configure process
@@ -53,7 +54,8 @@ WIN32LIBS = $(@WIN32@)
 
 # inference rules
 .c.o:
-	$(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) $(PYTHON_INC) $(OPENSSL_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
+	@echo "Compiling $<"
+	$(NO_ECHO)$(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 ===="
@@ -77,12 +79,15 @@ win32:	$(WIN32OBJS)
 	@rm -f bacula-fd.exe
 
 bacula-fd:  $(SVROBJS) ../findlib/libfind.a ../lib/libbac.a @WIN32@
+	@echo "Linking $@ ..."
 	$(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \
-	  $(WIN32LIBS) $(FDLIBS) -lfind -lbac -lm $(PYTHON_LIBS) $(OPENSSL_LIBS) $(LIBS) $(DLIB)
+	  $(WIN32LIBS) $(FDLIBS) -lfind -lbac -lm $(PYTHON_LIBS) $(LIBS) \
+	  $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 
 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 $(PYTHON_LIBS) $(OPENSSL_LIBS) $(LIBS) $(DLIB)
+	   $(WIN32LIBS) $(FDLIBS) -lfind -lbac -lm $(PYTHON_LIBS) $(LIBS) \
+	   $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 	strip $@
 
 
@@ -102,7 +107,7 @@ realclean: clean
 
 distclean: realclean
 	if test $(srcdir) = .; then $(MAKE) realclean; fi
-	(cd $(srcdir); $(RMF) Makefile; $(RMF) -r CVS)
+	(cd $(srcdir); $(RMF) Makefile)
 	if test -f win32/Makefile; then \
 	   (cd win32; $(MAKE) distclean); \
 	fi
@@ -133,8 +138,8 @@ install: all
 
 uninstall:
 	(cd $(DESTDIR)$(sbindir); $(RMF) bacula-fd)
-	(cd $(DESTDIR)$(sbindir); $(RMF) bacula-fd.conf)
-	(cd $(DESTDIR)$(sbindir); $(RMF) bacula-fd.conf.new)
+	(cd $(DESTDIR)$(sysconfdir); $(RMF) bacula-fd.conf)
+	(cd $(DESTDIR)$(sysconfdir); $(RMF) bacula-fd.conf.new)
 
 
 
@@ -147,7 +152,7 @@ depend:
 	@$(MV) Makefile Makefile.bak
 	@$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile
 	@$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile
-	@$(CXX) -S -M $(CPPFLAGS) $(XINC) $(PYTHON_INC) $(OPENSSL_INC) -I$(srcdir) -I$(basedir) $(SQL_INC) *.c >> Makefile
+	@$(CXX) -S -M $(CPPFLAGS) $(XINC) $(PYTHON_INC) -I$(srcdir) -I$(basedir) $(SQL_INC) *.c >> Makefile
 	@if test -f Makefile ; then \
 	    $(RMF) Makefile.bak; \
 	else \