From: Tim Shimmin Date: Tue, 4 Jul 2006 03:51:26 +0000 (+0000) Subject: some Makefile dependency fixes X-Git-Tag: v1.1.0~616 X-Git-Url: http://git.apps.os.sepia.ceph.com/?p=xfstests-dev.git;a=commitdiff_plain;h=bb71991fb887cafad80835740708e77e91c37d44 some Makefile dependency fixes Merge of master-melb:xfs-cmds:26405a by kenmcd. specify platform for depend flags --- diff --git a/include/builddefs.in b/include/builddefs.in index d3459a35..1449aac6 100644 --- a/include/builddefs.in +++ b/include/builddefs.in @@ -56,12 +56,18 @@ 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) PCFLAGS = -nostdinc -I$(ROOT)/usr/include -I$(TOPDIR)/../irix/include +DEPENDFLAGS = -D__sgi__ +endif +ifeq ($(PKG_PLATFORM),freebsd) +DEPENDFLAGS = -D__FreeBSD__ endif GCFLAGS = $(OPTIMIZER) $(DEBUG) \ diff --git a/include/buildrules b/include/buildrules index c530bcc0..f7212831 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