From d931d17ea0e74aa039df07afeb2c58ac3f8dac71 Mon Sep 17 00:00:00 2001 From: Tim Shimmin Date: Tue, 4 Jul 2006 03:51:26 +0000 Subject: [PATCH] some Makefile dependency fixes Merge of master-melb:xfs-cmds:26405a by kenmcd. specify platform for depend flags --- include/builddefs.in | 4 ++++ include/buildrules | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/include/builddefs.in b/include/builddefs.in index 21edfb7c7..7079d80f0 100644 --- a/include/builddefs.in +++ b/include/builddefs.in @@ -95,16 +95,20 @@ GCCFLAGS = -funsigned-char -fno-strict-aliasing -Wall ifeq ($(PKG_PLATFORM),linux) PCFLAGS = -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 $(GCCFLAGS) +DEPENDFLAGS = -D__linux__ endif ifeq ($(PKG_PLATFORM),darwin) PCFLAGS = -traditional-cpp $(GCCFLAGS) +DEPENDFLAGS = -D__APPLE__ endif ifeq ($(PKG_PLATFORM),irix) PLDLIBS = -ldisk -lgen +DEPENDFLAGS = -D__sgi__ endif ifeq ($(PKG_PLATFORM),freebsd) PLDLIBS = -L/usr/local/lib -lintl PCFLAGS = -I/usr/local/include $(GCCFLAGS) +DEPENDFLAGS = -D__FreeBSD__ endif GCFLAGS = $(OPTIMIZER) $(DEBUG) \ diff --git a/include/buildrules b/include/buildrules index c530bcc06..f72128310 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 -- 2.47.2