X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fdird%2FMakefile.in;h=d202384b28d8ad077f640a5b1ac89110afc58092;hb=6e637fce30a1fdbc2da43552f513f529db4d4e87;hp=504f4d4f05154974e15eb8b6c52255fdac341a49;hpb=ae4e3afe6ecbc60671f96147c43ebf90f334d91e;p=bacula%2Fbacula

diff --git a/bacula/src/dird/Makefile.in b/bacula/src/dird/Makefile.in
index 504f4d4f05..d202384b28 100644
--- a/bacula/src/dird/Makefile.in
+++ b/bacula/src/dird/Makefile.in
@@ -18,8 +18,7 @@ thisdir = src/dird
 
 DEBUG=@DEBUG@
 
-OPENSSL_LIBS = @OPENSSL_LIBS@
-OPENSSL_INC = @OPENSSL_INC@
+GETTEXT_LIBS = @LIBINTL@
 
 PYTHON_LIBS = @PYTHON_LIBS@
 PYTHON_INC = @PYTHON_INCDIR@
@@ -30,13 +29,13 @@ dummy:
 #
 SVRSRCS = dird.c admin.c authenticate.c \
 	  autoprune.c backup.c bsr.c \
-	  catreq.c dird_conf.c expand.c \
+	  catreq.c dir_plugins.c dird_conf.c expand.c \
 	  fd_cmds.c getmsg.c inc_conf.c job.c \
-	  jobq.c mac.c \
+	  jobq.c migrate.c \
 	  mountreq.c msgchan.c next_vol.c newvol.c \
-	  python.c \
+	  pythondir.c \
 	  recycle.c restore.c run_conf.c \
-	  scheduler.c sql_cmds.c \
+	  scheduler.c \
 	  ua_acl.c ua_cmds.c ua_dotcmds.c \
 	  ua_query.c \
 	  ua_input.c ua_label.c ua_output.c ua_prune.c \
@@ -45,13 +44,13 @@ SVRSRCS = dird.c admin.c authenticate.c \
 	  ua_status.c ua_tree.c ua_update.c verify.c
 SVROBJS = dird.o admin.o authenticate.o \
 	  autoprune.o backup.o bsr.o \
-	  catreq.o dird_conf.o expand.o \
+	  catreq.o dir_plugins.o dird_conf.o expand.o \
 	  fd_cmds.o getmsg.o inc_conf.o job.o \
-	  jobq.o mac.o \
+	  jobq.o migrate.o \
 	  mountreq.o msgchan.o next_vol.o newvol.o \
-	  python.o \
+	  pythondir.o \
 	  recycle.o restore.o run_conf.o \
-	  scheduler.o sql_cmds.o \
+	  scheduler.o \
 	  ua_acl.o ua_cmds.o ua_dotcmds.o \
 	  ua_query.o \
 	  ua_input.o ua_label.o ua_output.o ua_prune.o \
@@ -68,19 +67,24 @@ EXTRAOBJS = @OBJLIST@
 
 # 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 bacula-dir @STATIC_DIR@
 	@echo "==== Make of dird is good ===="
 	@echo " "
 
 bacula-dir:  $(SVROBJS) ../lib/libbac.a ../cats/libsql.a ../findlib/libfind.a
+	@echo "Linking $@ ..."
 	$(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) \
-	      -lsql -lfind -lbac -lm $(PYTHON_LIBS) $(DLIB) $(DB_LIBS) $(LIBS) $(OPENSSL_LIBS)
+	      -lsql -lfind -lbac -lm $(PYTHON_LIBS) $(DLIB) $(DB_LIBS) $(LIBS) \
+	      $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+
 
 static-bacula-dir:  $(SVROBJS) ../lib/libbac.a ../cats/libsql.a ../findlib/libfind.a
 	$(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) \
-	      -lsql -lbac -lfind -lm $(PYTHON_LIBS) $(DLIB) $(DB_LIBS) $(LIBS) $(OPENSSL_LIBS)
+	      -lsql -lbac -lfind -lm $(PYTHON_LIBS) $(DLIB) $(DB_LIBS) $(LIBS) \
+	      $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 	strip $@
 
 
@@ -97,7 +101,7 @@ realclean: clean
 
 distclean: realclean
 	if test $(srcdir) = .; then $(MAKE) realclean; fi
-	(cd $(srcdir); $(RMF) Makefile; $(RMF) -r CVS)
+	(cd $(srcdir); $(RMF) Makefile)
 
 devclean: realclean
 	if test $(srcdir) = .; then $(MAKE) realclean; fi
@@ -140,7 +144,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 \