|
 |
22de3fe |
--- pcmciautils-005/Makefile.foo 2005-07-08 22:03:40.000000000 -0400
|
|
|
22de3fe |
+++ pcmciautils-005/Makefile 2005-07-08 22:05:02.000000000 -0400
|
|
|
22de3fe |
@@ -96,8 +96,7 @@
|
|
|
22de3fe |
GCC_LIB := $(shell $(CC) -print-libgcc-file-name )
|
|
|
22de3fe |
|
|
|
22de3fe |
# use '-Os' optimization if available, else use -O2
|
|
|
22de3fe |
-OPTIMIZATION := ${shell if $(CC) -Os -S -o /dev/null -xc /dev/null >/dev/null 2>&1; \
|
|
|
22de3fe |
- then echo "-Os"; else echo "-O2" ; fi}
|
|
|
22de3fe |
+OPTIMIZATION := $(RPM_OPT_FLAGS)
|
|
|
22de3fe |
|
|
|
22de3fe |
# check if compiler option is supported
|
|
|
22de3fe |
cc-supports = ${shell if $(CC) ${1} -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; fi;}
|
|
|
22de3fe |
@@ -134,24 +133,12 @@
|
|
|
22de3fe |
LIB_PCI_OBJS = -lc -lpci
|
|
|
22de3fe |
#LDFLAGS =
|
|
|
22de3fe |
|
|
|
22de3fe |
-ifeq ($(strip $(V)),false)
|
|
|
22de3fe |
- QUIET=@$(PWD)/build/ccdv
|
|
|
22de3fe |
- HOST_PROGS=build/ccdv
|
|
|
22de3fe |
-else
|
|
|
22de3fe |
- QUIET=
|
|
|
22de3fe |
- HOST_PROGS=
|
|
|
22de3fe |
-endif
|
|
|
22de3fe |
+QUIET=
|
|
|
22de3fe |
+HOST_PROGS=
|
|
|
22de3fe |
|
|
|
22de3fe |
-# if DEBUG is enabled, then we do not strip or optimize
|
|
|
22de3fe |
-ifeq ($(strip $(DEBUG)),true)
|
|
|
22de3fe |
- CFLAGS += -O1 -g -DDEBUG -D_GNU_SOURCE
|
|
|
22de3fe |
- LDFLAGS += -Wl,-warn-common
|
|
|
22de3fe |
- STRIPCMD = /bin/true -Since_we_are_debugging
|
|
|
22de3fe |
-else
|
|
|
22de3fe |
- CFLAGS += $(OPTIMIZATION) -fomit-frame-pointer -D_GNU_SOURCE
|
|
|
22de3fe |
- LDFLAGS += -s -Wl,-warn-common
|
|
|
22de3fe |
- STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment
|
|
|
22de3fe |
-endif
|
|
|
22de3fe |
+CFLAGS += $(OPTIMIZATION) -D_GNU_SOURCE
|
|
|
22de3fe |
+LDFLAGS += -Wl,-warn-common
|
|
|
22de3fe |
+STRIPCMD = /bin/true
|
|
|
22de3fe |
|
|
|
22de3fe |
# if STARTUP is disabled, we can skip a few things
|
|
|
22de3fe |
ifeq ($(strip $(STARTUP)),false)
|
|
|
22de3fe |
@@ -165,7 +152,7 @@
|
|
|
22de3fe |
endif
|
|
|
22de3fe |
|
|
|
22de3fe |
|
|
|
70924b6 |
-all: ccdv $(PCCARDCTL) $(PCMCIA_CHECK_BROKEN_CIS) $(PCMCIA_SOCKET_STARTUP_BUILD) udevrules
|
|
|
70924b6 |
+all: $(PCCARDCTL) $(PCMCIA_CHECK_BROKEN_CIS) $(PCMCIA_SOCKET_STARTUP_BUILD) udevrules
|
|
|
22de3fe |
|
|
|
22de3fe |
ccdv:
|
|
|
22de3fe |
@echo "Building ccdv"
|
|
|
bd7333f |
--- pcmciautils-006/Makefile.foo 2005-07-20 17:25:13.000000000 -0400
|
|
|
bd7333f |
+++ pcmciautils-006/Makefile 2005-07-20 17:28:02.000000000 -0400
|
|
|
bd7333f |
@@ -129,8 +129,8 @@
|
|
|
bd7333f |
|
|
|
bd7333f |
#LIBC =
|
|
|
bd7333f |
CFLAGS += $(WARNINGS) -I$(GCCINCDIR)
|
|
|
bd7333f |
-LIB_OBJS = -lc -lsysfs
|
|
|
bd7333f |
-LIB_PCI_OBJS = -lc -lpci
|
|
|
bd7333f |
+LIB_OBJS = -Wl,-Bstatic -lsysfs -Wl,-Bdynamic
|
|
|
bd7333f |
+LIB_PCI_OBJS = -lpci
|
|
|
bd7333f |
#LDFLAGS =
|
|
|
bd7333f |
|
|
|
bd7333f |
QUIET=
|