blob: 9b38048feebaf80cbe525921601ccc483530f223 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
|
--- src/files/Makefile.in 2016-10-16 10:14:36.000000000 -0500
+++ src/filed/Makefile.in 2016-11-10 01:33:16.120709000 -0500
@@ -25,6 +25,7 @@
GNUTLS_LIBS_NONSHARED = @GNUTLS_LIBS_NONSHARED@
JANSSON_CPPFLAGS = @JANSSON_INC@
+JANSSON_LDFLAGS = @JANSSON_LIBS@
COMPRESS_CPPFLAGS += @ZLIB_INC@ @LZO_INC@ @FASTLZ_INC@
first_rule: all
@@ -78,7 +79,7 @@
@echo "Linking $@ ..."
$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \
-lbareosfind -lbareoscfg -lbareos -lm $(FDLIBS) $(LIBS) \
- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED)
+ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED) $(JANSSON_LDFLAGS)
static-bareos-fd: Makefile $(SVROBJS) \
../findlib/libbareosfind.a \
@@ -87,7 +88,7 @@
@echo "Linking $@ ..."
$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \
-lbareosfind -lbareoscfg -lbareos -lm $(FDLIBS) $(LIBS) \
- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(GNUTLS_LIBS)
+ $(DLIB) $(WRAPLIBS) $(GETTEXT_STATIC_LIBS) $(OPENSSL_LIBS) $(GNUTLS_LIBS) $(JANSSON_LDFLAGS)
strip $@
Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
@@ -137,8 +138,8 @@
destconf="$$RESDIR/$$RES.new"; \
echo " $$RESTYPE/$$RES as \"$$destconf\" (keep existing)"; \
else \
- destconf="$$RESDIR/$$RES"; \
- echo " $$RESTYPE/$$RES as \"$$destconf\""; \
+ destconf="$$RESDIR/$$RES.sample"; \
+ echo " $$RESTYPE/$$RES as \"$$destconf\".sample"; \
fi; \
${INSTALL_CONFIG} "$$f" "$$destconf"; \
if test "x${fd_group}" != "x"; then \
|
