Add mingw files and changes

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@2921 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/lib/bpipe.c b/bacula/src/lib/bpipe.c
index b87f106ab53b99310f4ce7afc9971eb5f0823a14..630edcc2659ae39e643148f5e2d0af1ca505f226 100644 (file)
--- a/bacula/src/lib/bpipe.c
+++ b/bacula/src/lib/bpipe.c
@@ -24,8 +24,19 @@
 #include "bacula.h"
 #include "jcr.h"
 
-int execvp_errors[] = {EACCES, ENOEXEC, EFAULT, EINTR, E2BIG,
-                     ENAMETOOLONG, ENOMEM, ETXTBSY, ENOENT};
+int execvp_errors[] = {
+       EACCES,
+       ENOEXEC,
+       EFAULT,
+       EINTR,
+       E2BIG,
+       ENAMETOOLONG,
+       ENOMEM,
+#ifndef WIN32
+       ETXTBSY,
+#endif
+       ENOENT
+};
 int num_execvp_errors = (int)(sizeof(execvp_errors)/sizeof(int));
 
 
@@ -221,7 +232,11 @@ int close_bpipe(BPIPE *bpipe)
          }
          Dmsg1(800, "child status=%d\n", stat & ~b_errno_exit);
       } else if (WIFSIGNALED(chldstatus)) {  /* process died */
+#ifndef WIN32
          stat = WTERMSIG(chldstatus);
+#else
+#warning "WTERMSIG undefined in Win32 !!!"
+#endif
          Dmsg1(800, "Child died from signale %d\n", stat);
          stat |= b_errno_signal;      /* exit signal returned */
       }

diff --git a/bacula/src/lib/util.c b/bacula/src/lib/util.c
index 95799f2498b19841340da8a8b976e3872fcc08de..6fd842072ccafa1eb8f98ec1d636877cfb66d831 100644 (file)
--- a/bacula/src/lib/util.c
+++ b/bacula/src/lib/util.c
@@ -120,7 +120,8 @@ unbash_spaces(POOL_MEM &pm)
    }
 }
 
-#if    HAVE_WIN32 && !HAVE_CONSOLE && !HAVE_WXCONSOLE
+/* kludge below disabled for MinGW, due to link problems ... */
+#if    HAVE_WIN32 && !HAVE_CONSOLE && !HAVE_WXCONSOLE && !HAVE_MINGW
 extern long _timezone;
 extern int _daylight;
 extern long _dstbias;
@@ -133,7 +134,7 @@ char *encode_time(time_t time, char *buf)
    struct tm tm;
    int n = 0;
 
-#if    HAVE_WIN32 && !HAVE_CONSOLE && !HAVE_WXCONSOLE
+#if    HAVE_WIN32 && !HAVE_CONSOLE && !HAVE_WXCONSOLE && !HAVE_MINGW
     /*
      * Gross kludge to avoid a seg fault in Microsoft's CRT localtime_r(),
      *  which incorrectly references a NULL returned from gmtime() if

diff --git a/bacula/src/win32/compat/compat.cpp b/bacula/src/win32/compat/compat.cpp
index 0b864b198dd20353cf8c4ce8e9e925942010fd3d..69a20393aed943cfb5f0b5d557def8fec72285bd 100644 (file)
--- a/bacula/src/win32/compat/compat.cpp
+++ b/bacula/src/win32/compat/compat.cpp
@@ -42,7 +42,7 @@ extern int enable_vss;
 
 // from MicroSoft SDK (KES) is the diff between Jan 1 1601 and Jan 1 1970
 #ifdef HAVE_MINGW
-#define WIN32_FILETIME_ADJUST 0x19DB1DED53E8000UL //Not sure it works
+#define WIN32_FILETIME_ADJUST 0x19DB1DED53E8000ULL //Not sure it works
 #else
 #define WIN32_FILETIME_ADJUST 0x19DB1DED53E8000I64
 #endif

diff --git a/bacula/src/win32/compat/getopt.c b/bacula/src/win32/compat/getopt.c
index 566b8ef97e4286c9ee7f1afc3a7cb6bc9a9afb8b..2ea01c161354945d424ca10e53aab940cad8c8b5 100644 (file)
--- a/bacula/src/win32/compat/getopt.c
+++ b/bacula/src/win32/compat/getopt.c
@@ -193,10 +193,15 @@ static enum
 
 char *getenv ();
 
+#if 0
 static char *
 my_index (str, chr)
      const char *str;
      int chr;
+#else
+static char *
+my_index (const char *str, int chr)
+#endif
 {
   while (*str)
     {
@@ -207,11 +212,16 @@ my_index (str, chr)
   return 0;
 }
 
+#if 0
 static void
 my_bcopy (from, to, size)
      const char *from;
      char *to;
      int size;
+#else
+static void
+my_bcopy (const char *from, char *to, int size)
+#endif
 {
   int i;
   for (i = 0; i < size; i++)
@@ -238,8 +248,7 @@ static int last_nonopt;
    the new indices of the non-options in ARGV after they are moved.  */
 
 static void
-exchange (argv)
-     char **argv;
+exchange (char **argv)
 {
   int nonopts_size = (last_nonopt - first_nonopt) * sizeof (char *);
   char **temp = (char **) __alloca (nonopts_size);
@@ -316,13 +325,13 @@ exchange (argv)
    long-named options.  */
 
 int
-_getopt_internal (argc, argv, optstring, longopts, longind, long_only)
-     int argc;
-     char *const *argv;
-     const char *optstring;
-     const struct option *longopts;
-     int *longind;
-     int long_only;
+_getopt_internal (
+     int argc,
+     char *const *argv,
+     const char *optstring,
+     const struct option *longopts,
+     int *longind,
+     int long_only)
 {
   int option_index;
 
@@ -650,10 +659,10 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
 }
 
 int
-getopt (argc, argv, optstring)
-     int argc;
-     char *const *argv;
-     const char *optstring;
+getopt (
+     int argc,
+     char *const *argv,
+     const char *optstring)
 {
   return _getopt_internal (argc, argv, optstring,
                           (const struct option *) 0,

diff --git a/bacula/src/win32/compat/vss.cpp b/bacula/src/win32/compat/vss.cpp
index 4278a18acb5cfaac4982e5eafe9ee1b448315819..a96b985bce1ece46a8a3e4a1876e3ec3dd31dc67 100644 (file)
--- a/bacula/src/win32/compat/vss.cpp
+++ b/bacula/src/win32/compat/vss.cpp
@@ -4,7 +4,7 @@
 // Copyright transferred from MATRIX-Computer GmbH to
 //   Kern Sibbald by express permission.
 //
-//  Copyright (C) 2005 Kern Sibbald
+//  Copyright (C) 2005-2006 Kern Sibbald
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -55,12 +55,15 @@
 #include <fstream>
 using namespace std;   
 
+#ifndef HAVE_MINGW
 #include <atlcomcli.h>
 #include <objbase.h>
 
 
 // Used for safe string manipulation
 #include <strsafe.h>
+#endif
+
 #include "vss.h"
 
 
@@ -80,8 +83,8 @@ VSSClient::VSSClient()
     m_pVectorWriterStates = new vector<int>;
     m_pVectorWriterInfo = new vector<string>;
     m_uidCurrentSnapshotSet = GUID_NULL;
-    memset(m_wszUniqueVolumeName,0, sizeof(m_wszUniqueVolumeName));
-    memset(m_szShadowCopyName,0, sizeof(m_szShadowCopyName));
+    memset(m_wszUniqueVolumeName, 0, sizeof(m_wszUniqueVolumeName));
+    memset(m_szShadowCopyName, 0, sizeof(m_szShadowCopyName));
 }
 
 // Destructor
@@ -100,7 +103,7 @@ VSSClient::~VSSClient()
    if (m_pVectorWriterInfo)
       delete (m_pVectorWriterInfo);
 
-   // Call CoUninitialize if the CoInitialize was performed sucesfully
+   // Call CoUninitialize if the CoInitialize was performed successfully
    if (m_bCoInitializeCalled)
       CoUninitialize();
 }

diff --git a/bacula/src/win32/compat/vss_generic.cpp b/bacula/src/win32/compat/vss_generic.cpp
index 94beae42f0ce0eb3d4ca5e6aa5b446865fadf0c8..e4e4526c17932466483df774aef4cbd4f100cdd7 100644 (file)
--- a/bacula/src/win32/compat/vss_generic.cpp
+++ b/bacula/src/win32/compat/vss_generic.cpp
@@ -127,7 +127,9 @@ inline wstring AppendBackslash(wstring str)
 // Get the unique volume name for the given path
 inline wstring GetUniqueVolumeNameForPath(wstring path)
 {
+#if 0  
     _ASSERTE(path.length() > 0);    
+#endif
 
     // Add the backslash termination, if needed
     path = AppendBackslash(path);

diff --git a/bacula/src/win32/filed/Makefile.mingw b/bacula/src/win32/filed/Makefile.mingw
new file mode 100644 (file)
index 0000000..bb025ce
--- /dev/null
+++ b/bacula/src/win32/filed/Makefile.mingw
@@ -0,0 +1,504 @@
+# New makefile for win32 bacula executables
+# Using MinGW cross-compiler on GNU/Linux
+# 
+
+# Configuration
+
+# Version for cross-tools-3.4.2
+INCLUDE_MINGW = -I/data/cross-tools/mingw32/mingw32/include
+INCLUDE_GCC = -I/data/cross-tools/mingw32/include
+
+# For cross-tools-2.95.3
+#INCLUDE_MINGW = -I/data/cross-tools/include
+#INCLUDE_GCC = -I/data/cross-tools/i386-mingw32msvc/include
+
+INCLUDE_BACULA = -I../compat -I../.. -I../../win32/zlib
+INCLUDE_PTHREAD = -I/data/cross-tools-pthread/include
+INCLUDE_VSS = -I/data/Master/backup/vss-sdk/inc
+INCLUDE_ICONS = -I../../filed/win32
+
+INCLUDES = \
+               $(INCLUDE_GCC) \
+               $(INCLUDE_MINGW) \
+               $(INCLUDE_BACULA) \
+               $(INCLUDE_PTHREAD) \
+               $(INCLUDE_VSS) \
+               $(INCLUDE_ICONS) \
+
+EXCLUDED_INCLUDES = \
+
+HAVES = \
+       -DHAVE_STDINT_H \
+       -DHAVE_STDARG_H \
+       -DHAVE_STDLIB_H \
+       -DHAVE_ALLOCA_H \
+       -DHAVE_LIMITS_H \
+       -DHAVE_SYS_SOCKET_H \
+       -DHAVE_SYS_WAIT_H \
+       -DHAVE_SSL \
+       -DHAVE_MINGW \
+       -DHAVE_WIN32 \
+       -DHAVE_U_INT64_T \
+       -DHAVE_UINT64_T \
+       -DHAVE_ZLIB_H \
+       -DHAVE_LIBZ \
+
+HAVE_NOT = \
+       -DHAVE_SYS_BITYPES_H \
+       -DSIZEOF_LONG_LONG_INT=8
+
+NOT_DEFINED = \
+       
+DEFINES = \
+       -DWIN32 \
+       $(HAVES) \
+       -DCOMPILING_BACULA \
+       -DWIN32_VSS \
+
+CC = mingw32-g++ $(DEFINES) $(INCLUDES)
+CXX = mingw32-g++ $(DEFINES) $(INCLUDES) 2>&1
+WINDRES = mingw32-windres
+
+#CC = i386-mingw32msvc-g++ $(DEFINES) $(INCLUDES)
+#CXX = i386-mingw32msvc-g++ $(DEFINES) $(INCLUDES)
+#WINDRES = i386-mingw32msvc-windres
+
+# first: all bacula-fd.exe
+first: all
+
+INTDIR = .
+
+##########################################################################
+
+# Files in src/win32/filed/
+OBJS_FILED_FAILED = \
+
+OBJS_FILED = \
+        $(INTDIR)/authenticate.o \
+        $(INTDIR)/backup.o \
+        $(INTDIR)/chksum.o \
+        $(INTDIR)/estimate.o \
+        $(INTDIR)/filed.o \
+        $(INTDIR)/filed_conf.o \
+        $(INTDIR)/heartbeat.o \
+        $(INTDIR)/job.o \
+        $(INTDIR)/restore.o \
+        $(INTDIR)/status.o \
+        $(INTDIR)/verify.o \
+        $(INTDIR)/verify_vol.o \
+        $(OBJS_FILED_FAILED)
+
+
+authenticate.o:        ../filed/authenticate.cpp
+       $(CXX) -c ../filed/authenticate.cpp -o authenticate.o
+
+backup.o:      ../filed/backup.cpp
+       $(CXX) -c ../filed/backup.cpp -o backup.o
+
+chksum.o:      ../filed/chksum.cpp
+       $(CXX) -c ../filed/chksum.cpp -o chksum.o
+
+estimate.o:    ../filed/estimate.cpp
+       $(CXX) -c ../filed/estimate.cpp -o estimate.o
+
+filed.o:       ../filed/filed.cpp
+       $(CXX) -c ../filed/filed.cpp -o filed.o
+
+filed_conf.o:  ../filed/filed_conf.cpp
+       $(CXX) -c ../filed/filed_conf.cpp -o filed_conf.o
+
+heartbeat.o:   ../filed/heartbeat.cpp
+       $(CXX) -c ../filed/heartbeat.cpp -o heartbeat.o
+
+job.o: ../filed/job.cpp
+       $(CXX) -c ../filed/job.cpp -o job.o
+
+restore.o:     ../filed/restore.cpp
+       $(CXX) -c ../filed/restore.cpp -o restore.o
+
+status.o:      ../filed/status.cpp
+       $(CXX) -c ../filed/status.cpp -o status.o
+
+verify.o:      ../filed/verify.cpp
+       $(CXX) -c ../filed/verify.cpp -o verify.o
+
+verify_vol.o:  ../filed/verify_vol.cpp
+       $(CXX) -c ../filed/verify_vol.cpp -o verify_vol.o
+
+######################################################################
+
+# Files in src/compat
+OBJS_COMPAT_FAILED = \
+               $(INTDIR)/vss_w2k3.o \
+
+OBJS_COMPAT = \
+               $(INTDIR)/print.o \
+               $(INTDIR)/compat.o \
+               $(INTDIR)/getopt.o \
+               $(INTDIR)/vss.o \
+               $(INTDIR)/vss_xp.o \
+               $(OBJS_COMPAT_FAILED)
+
+compat.o:      ../compat/compat.cpp
+       $(CXX) -c ../compat/compat.cpp -o compat.o
+# TODO
+
+getopt.o:      ../compat/getopt.c
+       $(CXX) -c ../compat/getopt.c -o getopt.o
+
+print.o:       ../compat/print.cpp
+       $(CXX) -c ../compat/print.cpp -o print.o
+
+vss.o: ../compat/vss.cpp
+       $(CXX) -c ../compat/vss.cpp -o vss.o
+# TODO
+
+vss_xp.o:      ../compat/vss_xp.cpp
+       $(CXX) -c ../compat/vss_xp.cpp -o vss_xp.o
+# TODO
+
+vss_w2k3.o:    ../compat/vss_w2k3.cpp
+       $(CXX) -c ../compat/vss_w2k3.cpp -o vss_w2k3.o
+# TODO
+
+
+
+######################################################################
+
+# Files in src/filed/win32
+OBJS_WIN = \
+        $(INTDIR)/winabout.o \
+        $(INTDIR)/winevents.o \
+        $(INTDIR)/winservice.o \
+        $(INTDIR)/winstat.o \
+        $(INTDIR)/wintray.o \
+               $(INTDIR)/winmain.o \
+        $(INTDIR)/winres.res
+
+winabout.o:    ../../filed/win32/winabout.cpp
+       $(CXX) -c ../../filed/win32/winabout.cpp -o winabout.o
+
+winevents.o:   ../../filed/win32/winevents.cpp
+       $(CXX) -c ../../filed/win32/winevents.cpp -o winevents.o
+
+winmain.o:     ../../filed/win32/winmain.cpp
+       $(CXX) -c ../../filed/win32/winmain.cpp -o winmain.o
+# TODO
+
+winservice.o:  ../../filed/win32/winservice.cpp
+       $(CXX) -c ../../filed/win32/winservice.cpp -o winservice.o
+
+winstat.o:     ../../filed/win32/winstat.cpp
+       $(CXX) -c ../../filed/win32/winstat.cpp -o winstat.o
+
+wintray.o:     ../../filed/win32/wintray.cpp
+       $(CXX) -c ../../filed/win32/wintray.cpp -o wintray.o
+
+winres.res:    ../../filed/win32/winres.rc
+       $(WINDRES) $(INCLUDE_ICONS) -O coff ../../filed/win32/winres.rc -o winres.res
+#      $(WINDRES) --help
+#      mingw32-nm winres.res
+
+######################################################################
+
+# Files in ??? Needed ???
+
+#       $(INTDIR)/StdAfx.o
+
+######################################################################
+
+# Files in src/findlib
+OBJS_FINDLIB = \
+        $(INTDIR)/attribs.o \
+        $(INTDIR)/bfile.o \
+        $(INTDIR)/create_file.o \
+        $(INTDIR)/enable_priv.o \
+        $(INTDIR)/find.o \
+        $(INTDIR)/find_one.o \
+        $(INTDIR)/fstype.o \
+        $(INTDIR)/makepath.o \
+        $(INTDIR)/match.o \
+        $(INTDIR)/save-cwd.o
+
+attribs.o:     ../../findlib/attribs.c
+       $(CXX) -c ../../findlib/attribs.c -o attribs.o
+
+bfile.o:       ../../findlib/bfile.c
+       $(CXX) -c ../../findlib/bfile.c -o bfile.o
+
+create_file.o: ../../findlib/create_file.c
+       $(CXX) -c ../../findlib/create_file.c -o create_file.o
+
+enable_priv.o: ../../findlib/enable_priv.c
+       $(CXX) -c ../../findlib/enable_priv.c -o enable_priv.o
+
+find.o:        ../../findlib/find.c
+       $(CXX) -c ../../findlib/find.c -o find.o
+
+find_one.o:    ../../findlib/find_one.c
+       $(CXX) -c ../../findlib/find_one.c -o find_one.o
+
+fstype.o:      ../../findlib/fstype.c
+       $(CXX) -c ../../findlib/fstype.c -o fstype.o
+
+makepath.o:    ../../findlib/makepath.c
+       $(CXX) -c ../../findlib/makepath.c -o makepath.o
+
+match.o:       ../../findlib/match.c
+       $(CXX) -c ../../findlib/match.c -o match.o
+
+save-cwd.o:    ../../findlib/save-cwd.c
+       $(CXX) -c ../../findlib/save-cwd.c -o save-cwd.o
+
+
+######################################################################
+
+# Files in src/win32/lib, based on files in src/lib
+LIB_OBJS_FAILED = \
+        $(INTDIR)/bpipe.o \
+
+LIB_OBJS = \
+        $(INTDIR)/address_conf.o \
+        $(INTDIR)/alist.o \
+        $(INTDIR)/alloc.o \
+        $(INTDIR)/attr.o \
+        $(INTDIR)/base64.o \
+        $(INTDIR)/berrno.o \
+        $(INTDIR)/bget_msg.o \
+        $(INTDIR)/bnet.o \
+        $(INTDIR)/bnet_server.o \
+        $(INTDIR)/bshm.o \
+        $(INTDIR)/bsys.o \
+        $(INTDIR)/btime.o \
+        $(INTDIR)/btimers.o \
+        $(INTDIR)/cram-md5.o \
+        $(INTDIR)/crc32.o \
+        $(INTDIR)/daemon.o \
+        $(INTDIR)/dlist.o \
+        $(INTDIR)/edit.o \
+        $(INTDIR)/fnmatch.o \
+        $(INTDIR)/hmac.o \
+        $(INTDIR)/htable.o \
+        $(INTDIR)/idcache.o \
+        $(INTDIR)/jcr.o \
+        $(INTDIR)/lex.o \
+        $(INTDIR)/md5.o \
+        $(INTDIR)/mem_pool.o \
+        $(INTDIR)/message.o \
+        $(INTDIR)/parse_conf.o \
+        $(INTDIR)/pythonlib.o \
+        $(INTDIR)/queue.o \
+        $(INTDIR)/regex.o \
+        $(INTDIR)/res.o \
+        $(INTDIR)/rwlock.o \
+        $(INTDIR)/semlock.o \
+        $(INTDIR)/serial.o \
+        $(INTDIR)/sha1.o \
+        $(INTDIR)/signal.o \
+        $(INTDIR)/smartall.o \
+        $(INTDIR)/tls.o \
+        $(INTDIR)/var.o \
+        $(INTDIR)/watchdog.o \
+        $(INTDIR)/winapi.o \
+        $(INTDIR)/workq.o \
+        $(INTDIR)/scan.o \
+        $(INTDIR)/tree.o \
+        $(INTDIR)/util.o \
+        $(LIB_OBJS_FAILED) \
+
+OBJS = $(LIB_OBJS) $(OBJS_COMPAT) $(OBJS_WIN) $(OBJS_FINDLIB) $(OBJS_FILED)
+
+LIBS = \
+       -L/data/cross-tools/mingw32/mingw32/lib \
+       /data/cross-tools/mingw32/mingw32/lib/libole32.a \
+       /data/cross-tools/mingw32/mingw32/lib/liboleaut32.a \
+       /data/cross-tools/mingw32/mingw32/lib/libuser32.a \
+       /data/cross-tools/mingw32/mingw32/lib/libadvapi32.a \
+       /data/cross-tools/mingw32/mingw32/lib/libgdi32.a \
+       /data/cross-tools/mingw32/mingw32/lib/libwsock32.a \
+       /data/cross-tools/mingw32/mingw32/lib/libshell32.a \
+       /data/cross-tools/mingw32/mingw32/lib/libnetapi32.a \
+       /data/cross-tools/mingw32/mingw32/lib/libuuid.a \
+       /data/cross-tools-pthread/lib/libpthreadGCE2.a \
+       /data/Master/backup/bacula/bacula/src/win32/zlib/libz.a \
+
+# LIBS = \
+#      -L/data/cross-tools/mingw32/mingw32/lib \
+#      libole32.a \
+#      liboleaut32.a \
+#      /data/cross-tools/mingw32/mingw32/lib/libuser32.a \
+#      /data/cross-tools/mingw32/mingw32/lib/libadvapi32.a \
+#      /data/cross-tools/mingw32/mingw32/lib/libgdi32.a \
+#      /data/cross-tools/mingw32/mingw32/lib/libwsock32.a \
+#      /data/cross-tools/mingw32/mingw32/lib/libshell32.a \
+
+#      pthreadVCE.a \
+#      zlib.a
+
+#
+# Rules for generating from ../lib
+# 
+
+address_conf.o:        ../lib/address_conf.cpp
+       $(CXX) -c ../lib/address_conf.cpp -o address_conf.o
+
+alist.o:       ../lib/alist.cpp
+       $(CXX) -c ../lib/alist.cpp -o alist.o
+
+alloc.o:       ../lib/alloc.cpp
+       $(CXX) -c ../lib/alloc.cpp -o alloc.o
+
+attr.o:        ../lib/attr.cpp
+       $(CXX) -c ../lib/attr.cpp -o attr.o
+
+base64.o:      ../lib/base64.cpp
+       $(CXX) -c ../lib/base64.cpp -o base64.o
+
+berrno.o:      ../lib/berrno.cpp
+       $(CXX) -c ../lib/berrno.cpp -o berrno.o
+
+bget_msg.o:    ../lib/bget_msg.cpp
+       $(CXX) -c ../lib/bget_msg.cpp -o bget_msg.o
+
+bnet.o:        ../lib/bnet.cpp
+       $(CXX) -c ../lib/bnet.cpp -o bnet.o
+
+bnet_server.o: ../lib/bnet_server.cpp
+       $(CXX) -c ../lib/bnet_server.cpp -o bnet_server.o
+
+bpipe.o:       ../lib/bpipe.cpp
+       $(CXX) -c ../lib/bpipe.cpp -o bpipe.o
+
+bshm.o:        ../lib/bshm.cpp
+       $(CXX) -c ../lib/bshm.cpp -o bshm.o
+
+bsys.o:        ../lib/bsys.cpp
+       $(CXX) -c ../lib/bsys.cpp -o bsys.o
+
+btime.o:       ../lib/btime.cpp
+       $(CXX) -c ../lib/btime.cpp -o btime.o
+
+btimers.o:     ../lib/btimers.cpp
+       $(CXX) -c ../lib/btimers.cpp -o btimers.o
+
+cram-md5.o:    ../lib/cram-md5.cpp
+       $(CXX) -c ../lib/cram-md5.cpp -o cram-md5.o
+
+crc32.o:       ../lib/crc32.cpp
+       $(CXX) -c ../lib/crc32.cpp -o crc32.o
+
+daemon.o:      ../lib/daemon.cpp
+       $(CXX) -c ../lib/daemon.cpp -o daemon.o
+
+dlist.o:       ../lib/dlist.cpp
+       $(CXX) -c ../lib/dlist.cpp -o dlist.o
+
+edit.o:        ../lib/edit.cpp
+       $(CXX) -c ../lib/edit.cpp -o edit.o
+
+fnmatch.o:     ../lib/fnmatch.cpp
+       $(CXX) -c ../lib/fnmatch.cpp -o fnmatch.o
+
+hmac.o:        ../lib/hmac.cpp
+       $(CXX) -c ../lib/hmac.cpp -o hmac.o
+
+htable.o:      ../lib/htable.cpp
+       $(CXX) -c ../lib/htable.cpp -o htable.o
+
+idcache.o:     ../lib/idcache.cpp
+       $(CXX) -c ../lib/idcache.cpp -o idcache.o
+
+jcr.o: ../lib/jcr.cpp
+       $(CXX) -c ../lib/jcr.cpp -o jcr.o
+
+lex.o: ../lib/lex.cpp
+       $(CXX) -c ../lib/lex.cpp -o lex.o
+
+md5.o: ../lib/md5.cpp
+       $(CXX) -c ../lib/md5.cpp -o md5.o
+
+mem_pool.o:    ../lib/mem_pool.cpp
+       $(CXX) -c ../lib/mem_pool.cpp -o mem_pool.o
+
+message.o:     ../lib/message.cpp
+       $(CXX) -c ../lib/message.cpp -o message.o
+
+parse_conf.o:  ../lib/parse_conf.cpp
+       $(CXX) -c ../lib/parse_conf.cpp -o parse_conf.o
+
+pythonlib.o:   ../lib/pythonlib.cpp
+       $(CXX) -c ../lib/pythonlib.cpp -o pythonlib.o
+
+queue.o:       ../lib/queue.cpp
+       $(CXX) -c ../lib/queue.cpp -o queue.o
+
+regex.o:       ../lib/regex.cpp
+       $(CXX) -c ../lib/regex.cpp -o regex.o
+
+res.o: ../lib/res.cpp
+       $(CXX) -c ../lib/res.cpp -o res.o
+
+rwlock.o:      ../lib/rwlock.cpp
+       $(CXX) -c ../lib/rwlock.cpp -o rwlock.o
+
+scan.o:        ../lib/scan.cpp
+       $(CXX) -c ../lib/scan.cpp -o scan.o
+
+semlock.o:     ../lib/semlock.cpp
+       $(CXX) -c ../lib/semlock.cpp -o semlock.o
+
+serial.o:      ../lib/serial.cpp
+       $(CXX) -c ../lib/serial.cpp -o serial.o
+
+sha1.o:        ../lib/sha1.cpp
+       $(CXX) -c ../lib/sha1.cpp -o sha1.o
+
+signal.o:      ../lib/signal.cpp
+       $(CXX) -c ../lib/signal.cpp -o signal.o
+
+smartall.o:    ../lib/smartall.cpp
+       $(CXX) -c ../lib/smartall.cpp -o smartall.o
+
+tls.o: ../lib/tls.cpp
+       $(CXX) -c ../lib/tls.cpp -o tls.o
+
+tree.o:        ../lib/tree.cpp
+       $(CXX) -c ../lib/tree.cpp -o tree.o
+
+util.o:        ../lib/util.cpp
+       $(CXX) -c ../lib/util.cpp -o util.o
+
+var.o: ../lib/var.cpp
+       $(CXX) -c ../lib/var.cpp -o var.o
+
+watchdog.o:    ../lib/watchdog.cpp
+       $(CXX) -c ../lib/watchdog.cpp -o watchdog.o
+
+winapi.o:      ../lib/winapi.cpp
+       $(CXX) -c ../lib/winapi.cpp -o winapi.o
+
+workq.o:       ../lib/workq.cpp
+       $(CXX) -c ../lib/workq.cpp -o workq.o
+
+# Targets
+
+all: bacula-fd.exe
+#      echo $PATH
+
+# all: $(LIB_OBJS) $(OBJS_FILED) $(OBJS_COMPAT) $(OBJS_WIN) $(OBJS_FINDLIB)
+# all: $(LIB_OBJS) $(OBJS_FILED) $(OBJS_WIN) $(OBJS_FINDLIB)
+
+# all: $(OBJS_FILED)   # OK
+# all: $(OBJS_COMPAT)  # TODO vss...
+# all: $(OBJS_WIN)             # OK
+# all: $(OBJS_FINDLIB) # OK
+# all: $(LIB_OBJS)             # OK
+
+# Link the executable ...
+bacula-fd.exe: $(OBJS)
+       $(CXX) $(OBJS) $(LIBS) -o bacula-fd.exe
+
+# TODO ...
+# Fix vss files: check for consistent levels of pointer indirection
+# bpipe.c: WTERMSIG undefined
+# getopt.c: alloca redefined warning
\ No newline at end of file