chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pass CROSS_COMPILE to AR and RANLIB down to extras/
[elogind.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index d3341a6c835e928bf478cd97f34ba9d5a93bce83..fb7428279ed764eb294f6941a269c9a44ce02f9f 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-116,9
+116,6
@@
CC = $(CROSS_COMPILE)gcc
LD = $(CROSS_COMPILE)gcc
AR = $(CROSS_COMPILE)ar
RANLIB = $(CROSS_COMPILE)ranlib
LD = $(CROSS_COMPILE)gcc
AR = $(CROSS_COMPILE)ar
RANLIB = $(CROSS_COMPILE)ranlib
-HOSTCC = gcc
-STRIP = $(CROSS_COMPILE)strip
-STRIPCMD = $(STRIP) -s
CFLAGS = -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
WARNINGS = -Wstrict-prototypes -Wsign-compare -Wshadow \
CFLAGS = -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
WARNINGS = -Wstrict-prototypes -Wsign-compare -Wshadow \
@@
-138,7
+135,6
@@
endif
# if DEBUG is enabled, then we do not strip
ifeq ($(strip $(DEBUG)),true)
CFLAGS += -DDEBUG
# if DEBUG is enabled, then we do not strip
ifeq ($(strip $(DEBUG)),true)
CFLAGS += -DDEBUG
- STRIPCMD =
endif
ifeq ($(strip $(USE_GCOV)),true)
endif
ifeq ($(strip $(USE_GCOV)),true)
@@
-178,7
+174,8
@@
all: $(PROGRAMS) $(MAN_PAGES)
CFLAGS="$(CFLAGS)" \
LD="$(LD)" \
LDFLAGS="$(LDFLAGS)" \
CFLAGS="$(CFLAGS)" \
LD="$(LD)" \
LDFLAGS="$(LDFLAGS)" \
- STRIPCMD="$(STRIPCMD)" \
+ AR="$(AR)" \
+ RANLIB="$(RANLIB)" \
LIB_OBJS="$(LIB_OBJS)" \
LIBUDEV="$(PWD)/$(LIBUDEV)" \
-C $$target $@ || exit 1; \
LIB_OBJS="$(LIB_OBJS)" \
LIBUDEV="$(PWD)/$(LIBUDEV)" \
-C $$target $@ || exit 1; \
@@
-198,10
+195,6
@@
all: $(PROGRAMS) $(MAN_PAGES)
$(PROGRAMS): %: $(HEADERS) $(GEN_HEADERS) $(LIBUDEV) %.o
$(E) " LD " $@
$(Q) $(LD) $(LDFLAGS) $@.o -o $@ $(LIBUDEV) $(LIB_OBJS)
$(PROGRAMS): %: $(HEADERS) $(GEN_HEADERS) $(LIBUDEV) %.o
$(E) " LD " $@
$(Q) $(LD) $(LDFLAGS) $@.o -o $@ $(LIBUDEV) $(LIB_OBJS)
-ifneq ($(STRIPCMD),)
- $(E) " STRIP " $@
- $(Q) $(STRIPCMD) $@
-endif
$(LIBUDEV): $(HEADERS) $(GEN_HEADERS) $(UDEV_OBJS)
$(Q) rm -f $@
$(LIBUDEV): $(HEADERS) $(GEN_HEADERS) $(UDEV_OBJS)
$(Q) rm -f $@
@@
-349,7
+342,7
@@
ChangeLog: Makefile
@ rm $@.tmp
gcov-all:
@ rm $@.tmp
gcov-all:
- $(MAKE) clean all
STRIPCMD=
USE_GCOV=true
+ $(MAKE) clean all USE_GCOV=true
@ echo
@ echo "binaries built with gcov support."
@ echo "run the tests and analyze with 'make udev_gcov.txt'"
@ echo
@ echo "binaries built with gcov support."
@ echo "run the tests and analyze with 'make udev_gcov.txt'"