blob: 2d5bfcc0a0b09c7db4430448bae7dad48231b6f4 (
plain)
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
40
41
42
43
44
|
Handle builds without C++
libxmlrpc nicely handles the fact of being built without C++ support,
except for two locations, fixed by this patch.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Alvaro Gamez Machado <alvaro.gamez@hazent.com>
Index: b/lib/util/Makefile
===================================================================
--- a/lib/util/Makefile
+++ b/lib/util/Makefile
@@ -41,11 +41,14 @@
LIBOBJS = \
casprintf.o \
cmdline_parser.o \
- cmdline_parser_cpp.o \
getoptx.o \
string_parser.o \
stripcaseeq.o \
+ifeq ($(ENABLE_CPLUSPLUS),yes)
+LIBOBJS += cmdline_parser_cpp.o
+endif
+
.PHONY: all
all: $(LIBOBJS)
Index: b/lib/Makefile
===================================================================
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -9,7 +9,10 @@
# Build up SUBDIRS:
SUBDIRS =
-SUBDIRS += util libutil libutil++
+SUBDIRS += util libutil
+ifeq ($(ENABLE_CPLUSPLUS),yes)
+ SUBDIRS += libutil++
+endif
ifeq ($(ENABLE_ABYSS_SERVER),yes)
SUBDIRS += abyss
ifeq ($(ENABLE_CPLUSPLUS),yes)
|
