Skip to content

Commit eb4bc64

Browse files
committed
Updated build scripts
1 parent 209a27e commit eb4bc64

File tree

3 files changed

+32
-14
lines changed

3 files changed

+32
-14
lines changed

CHANGELOG

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
*******************************************************************************
44

55
=== 1.0.4 ===
6+
* Updated build scripts.
67

78
=== 1.0.3 ===
89
* Moving towards C++ 11.

make/system.mk

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -198,29 +198,31 @@ TEST := 0
198198

199199
# Set-up list of common variables
200200
COMMON_VARS = \
201-
ROOTDIR \
202-
ROOT_ARTIFACT_ID \
203-
PLATFORM \
204201
ARCHITECTURE \
205202
ARCHITECTURE_FAMILY \
206203
ARCHITECTURE_CFLAGS \
204+
BINDIR \
207205
BUILDDIR \
206+
DEBUG \
207+
ETCDIR \
208+
EXECUTABLE_EXT \
209+
EXPORT_SYMBOLS \
208210
FEATURES \
211+
INCDIR \
212+
INSTALL_HEADERS \
213+
LIBDIR \
209214
LIBRARY_EXT \
210215
LIBRARY_PREFIX \
211-
STATICLIB_EXT \
212-
EXECUTABLE_EXT \
213216
PKGCONFIG_EXT \
217+
PLATFORM \
214218
PREFIX \
215-
LIBDIR \
219+
ROOTDIR \
220+
ROOT_ARTIFACT_ID \
221+
PROFILE \
216222
SHAREDDIR \
217-
BINDIR \
218-
INCDIR \
219-
ETCDIR \
223+
STATICLIB_EXT \
220224
TEMPDIR \
221225
TEST \
222-
DEBUG \
223-
PROFILE \
224226
TRACE
225227

226228
.PHONY: sysvars
@@ -238,8 +240,10 @@ sysvars:
238240
echo " DEVEL build with modules checked out for read/write URL"
239241
echo " ETCDIR location of system configuration files"
240242
echo " EXECUTABLE_EXT file extension for executable files"
243+
echo " EXPORT_SYMBOLS make export symbols visible"
241244
echo " FEATURES list of features enabled in the build"
242245
echo " INCDIR location of the header files"
246+
echo " INSTALL_HEADERS install headers (enabled by default)"
243247
echo " LIBDIR location of the library"
244248
echo " LIBRARY_EXT file extension for library files"
245249
echo " LIBRARY_PREFIX prefix used for library file"

make/tools.mk

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,13 +102,26 @@ endif
102102
ifeq ($(TEST),1)
103103
CFLAGS_EXT += -DLSP_TESTING
104104
CXXFLAGS_EXT += -DLSP_TESTING
105+
EXPORT_SYMBOLS ?= 1
105106
else
106-
ifneq ($(ARTIFACT_EXPORT_ALL),1)
107-
CFLAGS_EXT += -fvisibility=hidden
108-
CXXFLAGS_EXT += -fvisibility=hidden
107+
ifeq ($(ARTIFACT_EXPORT_SYMBOLS),1)
108+
EXPORT_SYMBOLS ?= 1
109+
else
110+
EXPORT_SYMBOLS ?= 0
109111
endif
110112
endif
111113

114+
ifneq ($(EXPORT_SYMBOLS),1)
115+
CFLAGS_EXT += -fvisibility=hidden
116+
CXXFLAGS_EXT += -fvisibility=hidden
117+
endif
118+
119+
ifneq ($(ARTIFACT_EXPORT_HEADERS),0)
120+
INSTALL_HEADERS ?= 1
121+
else
122+
INSTALL_HEADERS ?= 0
123+
endif
124+
112125
# Define flags for (cross) build
113126
CFLAGS += \
114127
$(CFLAGS_EXT) \

0 commit comments

Comments
 (0)