From: Eric Bollengier <eric@baculasystems.com>
Date: Wed, 5 Aug 2020 08:02:39 +0000 (+0200)
Subject: BEE Backport bacula/src/win32/dird/Makefile
X-Git-Tag: Release-11.3.2~1340
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=254f42ef17af3fcd2cbad5d9a951dd24ffb914c6;p=thirdparty%2Fbacula.git

BEE Backport bacula/src/win32/dird/Makefile

This commit is the result of the squash of the following main commits:

Author: Eric Bollengier <eric@baculasystems.com>
Date:   Fri Jan 10 18:12:08 2020 +0100

    Rename BEE_XXX_YYY_SRCS into EXTRA_XXX_YYY_SRCS and add --disable-bee ./configure option
---

diff --git a/bacula/src/win32/dird/Makefile b/bacula/src/win32/dird/Makefile
index 51231c1efb..51d7951dd9 100644
--- a/bacula/src/win32/dird/Makefile
+++ b/bacula/src/win32/dird/Makefile
@@ -28,6 +28,9 @@ DEFINES = \
 vpath %.c $(MAINDIR)/src/dird $(BUILDDIR)/libwin32
 vpath %.cpp $(MAINDIR)/src/dird $(BUILDDIR)/libwin32
 
+EXTRA_DIRD_OBJS_ORG = $(EXTRA_DIRD_SRCS:.c=.o)
+EXTRA_DIRD_OBJS = $(addprefix $(OBJDIR)/, $(EXTRA_DIRD_OBJS_ORG))
+
 ##########################################################################
 
 DIRD_OBJS = \
@@ -78,6 +81,7 @@ DIRD_OBJS = \
 	$(OBJDIR)/mac_sql.o \
 	$(OBJDIR)/mac.o \
 	$(OBJDIR)/main.o \
+	$(EXTRA_DIRD_OBJS) \
 	$(OBJDIR)/bacula.res
 
 ALL_OBJS = $(DIRD_OBJS)