Skip to content

Commit f980b36

Browse files
committed
build: Change include shortcut D to not conflict with env
The variable D= can be used to quickly add defines. This sets a null default so it can only be overridden by the make command line. fixes #184 Change-Id: I84615174547f36208d6d577c1e30b6fac83139b3 Signed-off-by: Greg Tucker <[email protected]>
1 parent 998e03b commit f980b36

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

Makefile.am

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ pkginclude_HEADERS = include/test.h
77
noinst_LTLIBRARIES =
88
bin_PROGRAMS =
99
INCLUDE = -I $(srcdir)/include/
10+
D =
1011

1112
pkgconfigdir = $(libdir)/pkgconfig
1213
pkgconfig_DATA = libisal.pc

make.inc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ ifeq ($(shell uname),Darwin)
113113
STRIP_gcc =
114114
endif
115115

116+
D :=
116117
INCLUDE = $(patsubst %,-I%/,$(subst :, ,$(VPATH)))
117118
CFLAGS = $(CFLAGS_$(arch)) $(CFLAGS_$(CC)) $(DEBUG) -O2 $(DEFINES) $(INCLUDE)
118119
ASFLAGS = $(ASFLAGS_$(arch)) $(ASFLAGS_$(CC)) $(DEBUG_$(AS)) $(DEFINES) $(INCLUDE)

0 commit comments

Comments
 (0)