diff options
| author | Keith Marshall <keithmarshall@@users.sf.net> | 2012-01-15 15:31:11 +0000 |
|---|---|---|
| committer | Keith Marshall <keithmarshall@@users.sf.net> | 2012-01-15 15:31:11 +0000 |
| commit | f485d8ffb4a5cbcb14ca7e6fa46a9fcb77a98d54 (patch) | |
| tree | c25ab6f52d30f9ab4a45c7198c7ffe84b43b6692 /winsup/w32api/lib/ddk | |
| parent | 6208cfce7a49c2f3307f5fe30177a06b363e6ede (diff) | |
| download | cygnal-f485d8ffb4a5cbcb14ca7e6fa46a9fcb77a98d54.tar.gz cygnal-f485d8ffb4a5cbcb14ca7e6fa46a9fcb77a98d54.tar.bz2 cygnal-f485d8ffb4a5cbcb14ca7e6fa46a9fcb77a98d54.zip | |
More makefile code refactoring; fix top_srcdir references.
Diffstat (limited to 'winsup/w32api/lib/ddk')
| -rw-r--r-- | winsup/w32api/lib/ddk/Makefile.in | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/winsup/w32api/lib/ddk/Makefile.in b/winsup/w32api/lib/ddk/Makefile.in index 7879cdedc..d6813b6ce 100644 --- a/winsup/w32api/lib/ddk/Makefile.in +++ b/winsup/w32api/lib/ddk/Makefile.in @@ -16,28 +16,11 @@ top_builddir = @top_builddir@ VPATH = @srcdir@ include ${top_builddir}/Makefile.comm - -# Depending on if we build as part of winsup or mingw we need to -# add additional include paths in order to get the correct headers -# from the C library. -# -BUILDENV = @BUILDENV@ - -ifeq ($(BUILDENV), cygwin) -# winsup/include -# winsup/../newlib/libc/include -# winsup/../newlib/libc/sys/cygwin -EXTRA_INCLUDES = -I${srcdir}/../../include -I${srcdir}/../../../newlib/libc/include -I${srcdir}/../../../newlib/libc/sys/cygwin -endif -ifeq ($(BUILDENV), mingw) -EXTRA_INCLUDES = -I${srcdir}/../../mingw/include -endif - -INCLUDES = -I${srcdir}/../include $(EXTRA_INCLUDES) +INCLUDES = -I ${top_srcdir}/include $(EXTRA_INCLUDES) # Headers # -HEADERS = $(notdir $(wildcard ${srcdir}/../../include/ddk/*.h)) +HEADERS = $(notdir $(wildcard ${top_srcdir}/include/ddk/*.h)) # Libraries # @@ -91,7 +74,7 @@ ddk_includedir = ${inst_includedir}/ddk install-headers: $(need-DESTDIR-compatibility) $(mkinstalldirs) $(DESTDIR)${ddk_includedir} for file in $(HEADERS); do \ - $(INSTALL_DATA) ${srcdir}/../../include/ddk/$$file $(DESTDIR)${ddk_includedir}; \ + $(INSTALL_DATA) ${top_srcdir}/include/ddk/$$file $(DESTDIR)${ddk_includedir}; \ done # Uninstall headers and libraries from a target specified directory @@ -114,7 +97,7 @@ dist: mkdir ${distdir}/include/ddk chmod 755 ${distdir}/include/ddk for file in $(HEADERS); do \ - cp -p ${srcdir}/../../include/ddk/$$file ${distdir}/include/ddk; \ + cp -p ${top_srcdir}/include/ddk/$$file ${distdir}/include/ddk; \ done mkdir ${distdir}/lib/ddk chmod 755 ${distdir}/lib/ddk |