Skip to content

Commit 6ee6112

Browse files
committed
Fix off-source build
off-source build is broken in 5ef0f34 by replacing INCLUDES with AM_CPPFLAGS http://www.gnu.org/software/automake/manual/html_node/Program-Variables.html > AM_CPPFLAGS is ignored in preference to a per-executable (or per- library) _CPPFLAGS variable if it is defined.
1 parent 634ca64 commit 6ee6112

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

c2s/Makefile.am

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
LIBTOOL += --quiet
2-
AM_CPPFLAGS = -I@top_srcdir@
32

43
bin_PROGRAMS = c2s
54

65
c2s_SOURCES = authreg.c bind.c c2s.c main.c sm.c pbx.c pbx_commands.c address.c
7-
c2s_CPPFLAGS = -DCONFIG_DIR=\"$(sysconfdir)\" -DLIBRARY_DIR=\"$(pkglibdir)\"
6+
c2s_CPPFLAGS = -DCONFIG_DIR=\"$(sysconfdir)\" -DLIBRARY_DIR=\"$(pkglibdir)\" -I@top_srcdir@
87
c2s_LDFLAGS = -export-dynamic
98

109
noinst_HEADERS = c2s.h

sm/Makefile.am

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
LIBTOOL += --quiet
2-
AM_CPPFLAGS = -I@top_srcdir@
32

43
bin_PROGRAMS = sm
54

@@ -26,7 +25,7 @@ pkglib_LTLIBRARIES = mod_active.la \
2625
mod_status.la \
2726
mod_template-roster.la \
2827
mod_vacation.la \
29-
mod_validate.la
28+
mod_validate.la
3029

3130
noinst_HEADERS = sm.h
3231

@@ -41,7 +40,7 @@ sm_SOURCES = aci.c \
4140
sm.c \
4241
user.c
4342

44-
sm_CPPFLAGS = -DCONFIG_DIR=\"$(sysconfdir)\" -DLIBRARY_DIR=\"$(pkglibdir)\"
43+
sm_CPPFLAGS = -DCONFIG_DIR=\"$(sysconfdir)\" -DLIBRARY_DIR=\"$(pkglibdir)\" -I@top_srcdir@
4544
sm_LDFLAGS = -export-dynamic
4645
sm_LDADD = $(top_builddir)/sx/libsx.la \
4746
$(top_builddir)/mio/libmio.la \

0 commit comments

Comments
 (0)