kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-09 19:38:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

buildsystem: Unbreak 'make -qp' on 1.8.

Browse Source 
r408083 caused trouble with make -qp. Backport r408193 to 1.8 as well.

(closes issue ASTERISK-23382)
Reported by: Corey Farrell


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@409436 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Walter Doekes
2014-03-04 13:39:13 +00:00
parent b42ab7fe81
commit c6f7a6652a
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@@ -95,9 +95,6 @@ ifneq ($(wildcard makeopts),)
include makeopts include makeopts
endif endif
# we want the MENUSELECT_EMBED var
-include menuselect.makeopts
# start the primary CFLAGS and LDFLAGS with any that were provided # start the primary CFLAGS and LDFLAGS with any that were provided
# to the configure script # to the configure script
_ASTCFLAGS:=$(CONFIG_CFLAGS) _ASTCFLAGS:=$(CONFIG_CFLAGS)
@@ -330,7 +327,7 @@ makeopts.embed_rules: menuselect.makeopts
$(SUBDIRS): main/version.c include/asterisk/version.h include/asterisk/build.h include/asterisk/buildopts.h defaults.h makeopts.embed_rules $(SUBDIRS): main/version.c include/asterisk/version.h include/asterisk/build.h include/asterisk/buildopts.h defaults.h makeopts.embed_rules
ifeq ($(findstring $(OSARCH), mingw32 cygwin ),) ifeq ($(findstring $(OSARCH), mingw32 cygwin ),)
ifneq ($(MENUSELECT_EMBED),) ifeq ($(shell grep ^MENUSELECT_EMBED=$$ menuselect.makeopts 2>/dev/null),)
# Non-windows: # Non-windows:
# ensure that all module subdirectories are processed before 'main' during # ensure that all module subdirectories are processed before 'main' during
# a parallel build, since if there are modules selected to be embedded the # a parallel build, since if there are modules selected to be embedded the