diff options
| author | Chia-I Wu <[email protected]> | 2011-01-29 19:06:27 +0800 |
|---|---|---|
| committer | Chia-I Wu <[email protected]> | 2011-01-29 19:22:54 +0800 |
| commit | b825e4955243b8ecb57e58afafd8b2286fdd4369 (patch) | |
| tree | b9b8d5d3f7d2ff1855174f31a5068beddb91ca24 /src/mapi/es1api | |
| parent | 2a456dc123e8263de8e4666890a34f403faa9a39 (diff) | |
mapi: Workaround a bug in makedepend.
makedepend would crash when a source includes a header indirectly, such
as
#define HEADER "some-header.h"
#include HEADER
Do not define HEADER (makedepend would detects this as an incomplete
include) and add the dependency manually in the Makefile.
This should hopefully fix bug #33374.
Diffstat (limited to 'src/mapi/es1api')
| -rw-r--r-- | src/mapi/es1api/Makefile | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/mapi/es1api/Makefile b/src/mapi/es1api/Makefile index 4fa68e5c39d..aef694866c2 100644 --- a/src/mapi/es1api/Makefile +++ b/src/mapi/es1api/Makefile @@ -124,10 +124,15 @@ install: default install-headers install-pc $(MINSTALL) $(TOP)/$(LIB_DIR)/$(esapi_LIB_GLOB) \ $(DESTDIR)$(INSTALL_LIB_DIR) +# workaround a bug in makedepend +makedepend_CPPFLAGS := \ + $(filter-out -DMAPI_ABI_HEADER=%, $(esapi_CPPFLAGS)) +$(esapi_OBJECTS): glapi_mapi_tmp.h + depend: $(esapi_SOURCES) @echo "running $(MKDEP)" @touch depend - @$(MKDEP) $(MKDEP_OPTIONS) -f- $(DEFINES) $(esapi_CPPFLAGS) \ + @$(MKDEP) $(MKDEP_OPTIONS) -f- $(DEFINES) $(makedepend_CPPFLAGS) \ $(esapi_SOURCES) 2>/dev/null | \ sed -e 's,^$(GLAPI)/,,' -e 's,^$(MAPI)/,,' > depend |