--- pcmciautils-013/Makefile~	2006-03-26 14:56:41 +0400

+++ pcmciautils-013/Makefile	2006-05-07 18:57:24 +0400

@@ -111,8 +111,7 @@

 GCC_LIB := $(shell $(CC) -print-libgcc-file-name )

 # use '-Os' optimization if available, else use -O2

-OPTIMIZATION := ${shell if $(CC) -Os -S -o /dev/null -xc /dev/null >/dev/null 2>&1; \

-		then echo "-Os"; else echo "-O2" ; fi}

+OPTIMIZATION := $(RPM_OPT_FLAGS)

 # check if compiler option is supported

 cc-supports = ${shell if $(CC) ${1} -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; fi;}

@@ -145,33 +144,15 @@

 CFLAGS += $(WARNINGS) -I$(GCCINCDIR)

-LIB_OBJS = -lc -lsysfs

-LIB_PCI_OBJS = -lc -lpci

+LIB_OBJS = -lsysfs

+LIB_PCI_OBJS = -lpci

-ifeq ($(strip $(STATIC)),true)

-	LIB_OBJS = -lsysfs

-	LIB_PCI_OBJS = -lpci

-	LDFLAGS += -static

-else

-	LDFLAGS += -Wl,-warn-common

-endif

+QUIET=

+HOST_PROGS=

-ifeq ($(strip $(V)),false)

-	QUIET=@$(PWD)/build/ccdv

-	HOST_PROGS=build/ccdv

-else

-	QUIET=

-	HOST_PROGS=

-endif

-

-# if DEBUG is enabled, then we do not strip or optimize

-ifeq ($(strip $(DEBUG)),true)

-	CFLAGS  += -O1 -g -DDEBUG -D_GNU_SOURCE

-	STRIPCMD = /bin/true -Since_we_are_debugging

-else

-	CFLAGS  += $(OPTIMIZATION) -fomit-frame-pointer -D_GNU_SOURCE

-	STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment

-endif

+CFLAGS  += $(OPTIMIZATION) -D_GNU_SOURCE

+LDFLAGS += -Wl,-warn-common

+STRIPCMD = /bin/true

 # HOTPLUG or UDEV?

 ifeq ($(strip $(UDEV)),false)