aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-05-14 05:52:46 +0000
committerMike Frysinger <vapier@gentoo.org>2006-05-14 05:52:46 +0000
commitf720ef1fdb3e806a6730e743622b9e743443613d (patch)
treeac252ab1113504e087655047c5e33aff4243d487 /Makefile
parent- make sure we scan versioned symbols correctly on unstripped ELF files (diff)
downloadpax-utils-f720ef1fdb3e806a6730e743622b9e743443613d.tar.gz
pax-utils-f720ef1fdb3e806a6730e743622b9e743443613d.tar.bz2
pax-utils-f720ef1fdb3e806a6730e743622b9e743443613d.zip
only apply cap stuff to pspax files
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile23
1 files changed, 15 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 02f8c7f..a4affd2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
# Copyright 2003 Ned Ludd <solar@linbsd.net>
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-projects/pax-utils/Makefile,v 1.54 2006/05/13 23:42:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-projects/pax-utils/Makefile,v 1.55 2006/05/14 05:52:46 vapier Exp $
####################################################################
check_gcc=$(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; \
@@ -30,8 +30,8 @@ CP := cp
#LDFLAGS += -pie
ifeq ($(USE_CAP),yes)
-CPPFLAGS += -DWANT_SYSCAP
-LIBS += -lcap
+CPPFLAGS-pspax.c += -DWANT_SYSCAP
+LIBS-pspax += -lcap
endif
ifdef PV
@@ -61,17 +61,24 @@ debug:
@-/sbin/chpax -permsx $(ELF_TARGETS)
@-/sbin/paxctl -permsx $(ELF_TARGETS)
+compile.c = $(CC) $(CFLAGS) $(CPPFLAGS) $(CPPFLAGS-$<) -o $@ -c $<
+
+ifeq ($(V),)
+Q := @
+else
+Q :=
+endif
%.o: %.c
-ifeq ($(findstring s,$(MAKEFLAGS)),)
- @echo $(CC) $(CFLAGS) $(CPPFLAGS) -c $<
+ifeq ($(V),)
+ @echo $(compile.c)
endif
- @$(CC) $(CFLAGS) $(CPPFLAGS) $(WFLAGS) -c $<
+ $(Q)$(compile.c) $(WFLAGS)
$(ELF_TARGETS): $(ELF_OBJS) paxinc.o
- $(CC) $(CFLAGS) $(LDFLAGS) paxinc.o paxelf.o -o $@ $@.o $(LIBS)
+ $(CC) $(CFLAGS) $(LDFLAGS) paxinc.o paxelf.o -o $@ $@.o $(LIBS) $(LIBS-$@)
$(MACH_TARGETS): $(MACH_OBJS) paxinc.o
- $(CC) $(CFLAGS) $(LDFLAGS) paxinc.o paxmacho.o -o $@ $@.o $(LIBS)
+ $(CC) $(CFLAGS) $(LDFLAGS) paxinc.o paxmacho.o -o $@ $@.o $(LIBS) $(LIBS-$@)
%.so: %.c
$(CC) -shared -fPIC -o $@ $<