mirror of
https://github.com/linux-apfs/apfstests.git
synced 2026-05-01 15:01:44 -07:00
some Makefile dependency fixes
Merge of master-melb:xfs-cmds:26405a by kenmcd. specify platform for depend flags
This commit is contained in:
@@ -56,12 +56,18 @@ GCCFLAGS = -funsigned-char -fno-strict-aliasing -Wall
|
|||||||
|
|
||||||
ifeq ($(PKG_PLATFORM),linux)
|
ifeq ($(PKG_PLATFORM),linux)
|
||||||
PCFLAGS = -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 $(GCCFLAGS)
|
PCFLAGS = -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 $(GCCFLAGS)
|
||||||
|
DEPENDFLAGS = -D__linux__
|
||||||
endif
|
endif
|
||||||
ifeq ($(PKG_PLATFORM),darwin)
|
ifeq ($(PKG_PLATFORM),darwin)
|
||||||
PCFLAGS = -traditional-cpp $(GCCFLAGS)
|
PCFLAGS = -traditional-cpp $(GCCFLAGS)
|
||||||
|
DEPENDFLAGS = -D__APPLE__
|
||||||
endif
|
endif
|
||||||
ifeq ($(PKG_PLATFORM),irix)
|
ifeq ($(PKG_PLATFORM),irix)
|
||||||
PCFLAGS = -nostdinc -I$(ROOT)/usr/include -I$(TOPDIR)/../irix/include
|
PCFLAGS = -nostdinc -I$(ROOT)/usr/include -I$(TOPDIR)/../irix/include
|
||||||
|
DEPENDFLAGS = -D__sgi__
|
||||||
|
endif
|
||||||
|
ifeq ($(PKG_PLATFORM),freebsd)
|
||||||
|
DEPENDFLAGS = -D__FreeBSD__
|
||||||
endif
|
endif
|
||||||
|
|
||||||
GCFLAGS = $(OPTIMIZER) $(DEBUG) \
|
GCFLAGS = $(OPTIMIZER) $(DEBUG) \
|
||||||
|
|||||||
+3
-1
@@ -61,7 +61,7 @@ $(_FORCE):
|
|||||||
depend : $(CFILES) $(HFILES)
|
depend : $(CFILES) $(HFILES)
|
||||||
$(SUBDIRS_MAKERULE)
|
$(SUBDIRS_MAKERULE)
|
||||||
touch .dep
|
touch .dep
|
||||||
$(MAKEDEPEND) -f - -- $(CFLAGS) -- $(CFILES) | \
|
$(MAKEDEPEND) $(DEPENDFLAGS) -f - -- $(CFLAGS) -- $(CFILES) | \
|
||||||
$(SED) -e 's,`pwd`,$(TOPDIR),g' \
|
$(SED) -e 's,`pwd`,$(TOPDIR),g' \
|
||||||
-e 's, */[^ ]*,,g' \
|
-e 's, */[^ ]*,,g' \
|
||||||
-e '/^[^ ]*: *$$/d' \
|
-e '/^[^ ]*: *$$/d' \
|
||||||
@@ -72,4 +72,6 @@ depend : $(CFILES) $(HFILES)
|
|||||||
# Include dep, but only if it exists
|
# Include dep, but only if it exists
|
||||||
ifeq ($(shell test -f .dep && echo .dep), .dep)
|
ifeq ($(shell test -f .dep && echo .dep), .dep)
|
||||||
include .dep
|
include .dep
|
||||||
|
else
|
||||||
|
$(OBJECTS): $(HFILES)
|
||||||
endif
|
endif
|
||||||
|
|||||||
Reference in New Issue
Block a user