diff options
| author | Tim Shimmin <tes@sgi.com> | 2006-07-04 03:51:26 +0000 |
|---|---|---|
| committer | Tim Shimmin <tes@sgi.com> | 2006-07-04 03:51:26 +0000 |
| commit | a9625ec754f1cff9c7baef0d9066eed3a902b890 (patch) | |
| tree | 2ecd489b12e9e857c89d55018f0df6b3b224620b | |
| parent | 564a66ce2f465bdb0d424979eac75fe0261aaad1 (diff) | |
| download | dmapi-dev-a9625ec754f1cff9c7baef0d9066eed3a902b890.tar.gz | |
some Makefile dependency fixes
Merge of master-melb:xfs-cmds:26405a by kenmcd.
bump version# for depend changes
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | doc/CHANGES | 3 | ||||
| -rw-r--r-- | include/builddefs.in | 10 | ||||
| -rw-r--r-- | include/buildrules | 4 |
4 files changed, 17 insertions, 2 deletions
@@ -3,5 +3,5 @@ # PKG_MAJOR=2 PKG_MINOR=2 -PKG_REVISION=5 +PKG_REVISION=6 PKG_BUILD=1 diff --git a/doc/CHANGES b/doc/CHANGES index e4e7f83..a72c495 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -1,3 +1,6 @@ +dmapi-2.2.6 (4 July 2006) + - Makefile dependency fixes + dmapi-2.2.5 (28 March 2006) - Debian packaging updates (debmake out, debhelper in) diff --git a/include/builddefs.in b/include/builddefs.in index b0bbeda..f198ef5 100644 --- a/include/builddefs.in +++ b/include/builddefs.in @@ -52,6 +52,16 @@ HAVE_ZIPPED_MANPAGES = @have_zipped_manpages@ ifeq ($(PKG_PLATFORM),linux) PCFLAGS = -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 +DEPENDFLAGS = -D__linux__ +endif +ifeq ($(PKG_PLATFORM),darwin) +DEPENDFLAGS = -D__APPLE__ +endif +ifeq ($(PKG_PLATFORM),irix) +DEPENDFLAGS = -D__sgi__ +endif +ifeq ($(PKG_PLATFORM),freebsd) +DEPENDFLAGS = -D__FreeBSD__ endif GCFLAGS = $(OPTIMIZER) $(DEBUG) -funsigned-char -fno-strict-aliasing -Wall \ diff --git a/include/buildrules b/include/buildrules index c530bcc..f721283 100644 --- a/include/buildrules +++ b/include/buildrules @@ -61,7 +61,7 @@ $(_FORCE): depend : $(CFILES) $(HFILES) $(SUBDIRS_MAKERULE) touch .dep - $(MAKEDEPEND) -f - -- $(CFLAGS) -- $(CFILES) | \ + $(MAKEDEPEND) $(DEPENDFLAGS) -f - -- $(CFLAGS) -- $(CFILES) | \ $(SED) -e 's,`pwd`,$(TOPDIR),g' \ -e 's, */[^ ]*,,g' \ -e '/^[^ ]*: *$$/d' \ @@ -72,4 +72,6 @@ depend : $(CFILES) $(HFILES) # Include dep, but only if it exists ifeq ($(shell test -f .dep && echo .dep), .dep) include .dep +else +$(OBJECTS): $(HFILES) endif |