Fix problem of accents with new Win32 code.

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

diff --git a/bacula/src/dird/Makefile.in b/bacula/src/dird/Makefile.in
index 90b74b31c8da8d5bff30ab079099c4f4c30e329a..068deac2f4f6ba3d3c88aa492eea4e5b1321a01c 100644 (file)
--- a/bacula/src/dird/Makefile.in
+++ b/bacula/src/dird/Makefile.in
@@ -18,6 +18,11 @@ thisdir = src/dird
 
 DEBUG=@DEBUG@
 
+GETTEXT_LIBS = @LIBINTL@
+
+OPENSSL_LIBS = @OPENSSL_LIBS@
+OPENSSL_INC = @OPENSSL_INC@
+
 PYTHON_LIBS = @PYTHON_LIBS@
 PYTHON_INC = @PYTHON_INCDIR@
 
@@ -29,9 +34,9 @@ SVRSRCS = dird.c admin.c authenticate.c \
          autoprune.c backup.c bsr.c \
          catreq.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 \
          ua_acl.c ua_cmds.c ua_dotcmds.c \
@@ -44,9 +49,9 @@ SVROBJS = dird.o admin.o authenticate.o \
          autoprune.o backup.o bsr.o \
          catreq.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 \
          ua_acl.o ua_cmds.o ua_dotcmds.o \
@@ -65,7 +70,7 @@ EXTRAOBJS = @OBJLIST@
 
 # inference rules
 .c.o:
-       $(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) $(PYTHON_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
+       $(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) $(PYTHON_INC) $(OPENSSL_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
 #-------------------------------------------------------------------------
 all: Makefile bacula-dir @STATIC_DIR@
        @echo "==== Make of dird is good ===="
@@ -73,11 +78,13 @@ all: Makefile bacula-dir @STATIC_DIR@
 
 bacula-dir:  $(SVROBJS) ../lib/libbac.a ../cats/libsql.a ../findlib/libfind.a
        $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) \
-             -lsql -lfind -lbac -lm $(PYTHON_LIBS) $(DLIB) $(DB_LIBS) $(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) 
+             -lsql -lbac -lfind -lm $(PYTHON_LIBS) $(DLIB) $(DB_LIBS) $(LIBS) \
+             $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
        strip $@
 
 
@@ -94,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
@@ -137,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) -I$(srcdir) -I$(basedir) $(SQL_INC) *.c >> Makefile
+       @$(CXX) -S -M $(CPPFLAGS) $(XINC) $(PYTHON_INC) $(OPENSSL_INC) -I$(srcdir) -I$(basedir) $(SQL_INC) *.c >> Makefile
        @if test -f Makefile ; then \
            $(RMF) Makefile.bak; \
        else \