diff options
| author | Keith Marshall <keithmarshall@@users.sf.net> | 2011-12-13 20:10:42 +0000 |
|---|---|---|
| committer | Keith Marshall <keithmarshall@@users.sf.net> | 2011-12-13 20:10:42 +0000 |
| commit | 5cc68751fd69f4b1e29b68b2c98bf8985302d314 (patch) | |
| tree | c9ab0244e65db0fec504ffd3a9e81754e47dbadb | |
| parent | eab07b8789c3e45e43f902d1ddc375dd7352ce08 (diff) | |
| download | cygnal-5cc68751fd69f4b1e29b68b2c98bf8985302d314.tar.gz cygnal-5cc68751fd69f4b1e29b68b2c98bf8985302d314.tar.bz2 cygnal-5cc68751fd69f4b1e29b68b2c98bf8985302d314.zip | |
Prepare for factoring out common makefile code.
| -rw-r--r-- | winsup/w32api/ChangeLog | 8 | ||||
| -rw-r--r-- | winsup/w32api/lib/ddk/Makefile.in | 24 |
2 files changed, 21 insertions, 11 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index ea8a82603..729e4cceb 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,11 @@ +2011-12-13 Keith Marshall <keithmarshall@users.sf.net> + + * lib/ddk/Makefile.in (ddk_includedir): New macro; define it, then use + it in install-headers and uninstall-headers rules, in place of... + (inst_includedir): ...this; we then redefine this for consistency with + makefiles in other subdirectories, as a prerequisite to factoring out + of common code. + 2011-12-12 Keith Marshall <keithmarshall@users.sf.net> * Makefile.in (FLAGS_TO_PASS): Pointless macro; remove it. (Defaults diff --git a/winsup/w32api/lib/ddk/Makefile.in b/winsup/w32api/lib/ddk/Makefile.in index d6040f3cc..3ac9c7c9f 100644 --- a/winsup/w32api/lib/ddk/Makefile.in +++ b/winsup/w32api/lib/ddk/Makefile.in @@ -37,14 +37,14 @@ endif datadir = @datadir@ infodir = @infodir@ ifneq (,$(findstring cygwin,$(target_alias))) -inst_includedir:=$(tooldir)/include/w32api/ddk +inst_includedir:=$(tooldir)/include/w32api inst_libdir:=$(tooldir)/lib/w32api else ifneq (,$(with_cross_host)) -inst_includedir:=$(tooldir)/include/w32api/ddk +inst_includedir:=$(tooldir)/include/w32api inst_libdir:=$(tooldir)/lib else -inst_includedir:=$(includedir)/ddk +inst_includedir:=$(includedir) inst_libdir:=$(libdir) endif endif @@ -159,13 +159,15 @@ install: install-libraries install-headers install-libraries: all $(need-DESTDIR-compatibility) $(mkinstalldirs) $(DESTDIR)$(inst_libdir) for i in $(LIBS); do \ - $(INSTALL_DATA) $$i $(DESTDIR)$(inst_libdir)/$$i ; \ + $(INSTALL_DATA) $$i $(DESTDIR)$(inst_libdir)/$$i; \ done +ddk_includedir = ${inst_includedir}/ddk + install-headers: $(need-DESTDIR-compatibility) - $(mkinstalldirs) $(DESTDIR)$(inst_includedir) + $(mkinstalldirs) $(DESTDIR)${ddk_includedir} for i in $(HEADERS); do \ - $(INSTALL_DATA) $(srcdir)/../../include/ddk/$$i $(DESTDIR)$(inst_includedir)/$$i ; \ + $(INSTALL_DATA) $(srcdir)/../../include/ddk/$$i $(DESTDIR)${ddk_includedir}; \ done # uninstall headers and libraries from a target specified directory @@ -173,27 +175,27 @@ uninstall: uninstall-libraries uninstall-headers uninstall-libraries: $(need-DESTDIR-compatibility) @for i in $(LIBS); do \ - rm -f $(DESTDIR)$(inst_libdir)/$$i ; \ + rm -f $(DESTDIR)$(inst_libdir)/$$i; \ done rmdir $(DESTDIR)$(inst_libdir) uninstall-headers: $(need-DESTDIR-compatibility) @for i in $(HEADERS); do \ - rm -r $(DESTDIR)$(inst_includedir)/$$i ; \ + rm -r $(DESTDIR)${ddk_includedir}/$$i; \ done - rmdir $(DESTDIR)$(inst_includedir) + rmdir $(DESTDIR)${ddk_includedir} dist: mkdir $(distdir)/include/ddk chmod 755 $(distdir)/include/ddk @for i in $(HEADERS); do \ - cp -p $(srcdir)/../../include/ddk/$$i $(distdir)/include/ddk/$$i ; \ + cp -p $(srcdir)/../../include/ddk/$$i $(distdir)/include/ddk/$$i; \ done mkdir $(distdir)/lib/ddk chmod 755 $(distdir)/lib/ddk @for i in $(DISTFILES); do \ - cp -p $(srcdir)/$$i $(distdir)/lib/ddk/$$i ; \ + cp -p $(srcdir)/$$i $(distdir)/lib/ddk/$$i; \ done Makefile: Makefile.in ../../config.status ../../configure |