kes Add context menu for floating a window.

[bacula/bacula] / bacula / src / win32 / dll / Makefile

diff --git a/bacula/src/win32/dll/Makefile b/bacula/src/win32/dll/Makefile
index d97316a272a491225e9735c67baef9db7ff5c389..c31ee045dc1cbcb62ccc5029ea61b872e7fd1df6 100644 (file)
--- a/bacula/src/win32/dll/Makefile
+++ b/bacula/src/win32/dll/Makefile
@@ -11,37 +11,18 @@ INCLUDES = \
        $(INCLUDE_PTHREADS) \
        $(INCLUDE_BACULA) \
        $(INCLUDE_ZLIB) \
-       $(INCLUDE_OPENSSL) \
-       $(INCLUDE_MYSQL)
+       $(INCLUDE_OPENSSL)
 
 DEFINES = \
        $(HAVES)
 
-VPATH = ../../cats ../compat ../../findlib ../../lib
+vpath %.c ../compat ../../findlib ../../lib
+vpath %.cpp ../compat ../../findlib ../../lib
 
 ######################################################################
 
 # Files files in src/lib
 
-CATS_OBJS = \
-       $(OBJDIR)/bdb.o \
-       $(OBJDIR)/bdb_create.o \
-       $(OBJDIR)/bdb_delete.o \
-       $(OBJDIR)/bdb_find.o \
-       $(OBJDIR)/bdb_get.o \
-       $(OBJDIR)/bdb_list.o \
-       $(OBJDIR)/bdb_update.o \
-       $(OBJDIR)/mysql.o \
-       $(OBJDIR)/postgresql.o \
-       $(OBJDIR)/sql.o \
-       $(OBJDIR)/sql_create.o \
-       $(OBJDIR)/sql_delete.o \
-       $(OBJDIR)/sql_find.o \
-       $(OBJDIR)/sql_get.o \
-       $(OBJDIR)/sql_list.o \
-       $(OBJDIR)/sql_update.o \
-       $(OBJDIR)/sqlite.o
-
 COMPAT_OBJS = \
        $(OBJDIR)/compat.o \
        $(OBJDIR)/print.o \
@@ -65,7 +46,6 @@ FIND_OBJS = \
 LIB_OBJS = \
        $(OBJDIR)/address_conf.o \
        $(OBJDIR)/alist.o \
-       $(OBJDIR)/alloc.o \
        $(OBJDIR)/attr.o \
        $(OBJDIR)/base64.o \
        $(OBJDIR)/berrno.o \
@@ -74,12 +54,11 @@ LIB_OBJS = \
        $(OBJDIR)/bnet_server.o \
        $(OBJDIR)/bpipe.o \
        $(OBJDIR)/bregex.o \
-       $(OBJDIR)/bshm.o \
+       $(OBJDIR)/bsock.o \
        $(OBJDIR)/bsnprintf.o \
        $(OBJDIR)/bsys.o \
        $(OBJDIR)/btime.o \
        $(OBJDIR)/btimers.o \
-       $(OBJDIR)/btree.o \
        $(OBJDIR)/cram-md5.o \
        $(OBJDIR)/crc32.o \
        $(OBJDIR)/crypto.o \
@@ -99,10 +78,10 @@ LIB_OBJS = \
        $(OBJDIR)/openssl.o \
        $(OBJDIR)/pythonlib.o \
        $(OBJDIR)/queue.o \
+       $(OBJDIR)/rblist.o \
        $(OBJDIR)/runscript.o \
        $(OBJDIR)/rwlock.o \
        $(OBJDIR)/scan.o \
-       $(OBJDIR)/semlock.o \
        $(OBJDIR)/serial.o \
        $(OBJDIR)/sha1.o \
        $(OBJDIR)/signal.o \
@@ -115,7 +94,7 @@ LIB_OBJS = \
        $(OBJDIR)/workq.o
 
 DLL_OBJS = \
-       $(CATS_OBJS) $(COMPAT_OBJS) $(FIND_OBJS) $(LIB_OBJS)
+       $(COMPAT_OBJS) $(FIND_OBJS) $(LIB_OBJS)
 
 STATIC_OBJS = \
        $(OBJDIR)/parse_conf.o \
@@ -127,7 +106,6 @@ ALL_OBJS = \
 LIBS_DLL = \
        $(LIBS_SSL) \
        $(LIBS_CRYPTO) \
-       $(LIBS_SQL) \
        $(LIBS_PTHREADS) \
        $(LIBS_ZLIB) \
        -lwsock32 \
@@ -163,11 +141,10 @@ $(LIBDIR)/libbacula.a: $(BINDIR)/bacula.dll $(STATIC_OBJS)
 
 $(BINDIR)/bacula.dll: DLL_DEFINE=BUILDING_DLL
 
-$(BINDIR)/bacula.dll: $(COMPAT_OBJS) $(DLL_OBJS) bacula.def
+$(BINDIR)/bacula.dll: $(DLL_OBJS) bacula.def
        @echo "Linking $@"
        $(call checkdir,$@)
        $(ECHO_CMD)$(CXX) $(LDFLAGS) -mdll -mwindows -Wl,--out-implib,$(OBJDIR)/bacula.a $^ $(LIBS_DLL) -o $@
-       $(makedbg)
 
 include ../Makefile.rules