Tweaks to disc-eject functionality.

[refind] / Make.common

diff --git a/Make.common b/Make.common
index f8eff663c4720d5d24fdc3e20d8eaef7389ddfff..89fd914e762405220a05ba5bbb52759ea7ed99a3 100644 (file)
--- a/Make.common
+++ b/Make.common
@@ -3,10 +3,10 @@
 # Common make rules for building with gnu-efi
 #
 
-EFIINC          = /usr/include/efi
-GNUEFILIB       = /usr/lib
-EFILIB          = /usr/lib
-EFICRT0         = /usr/lib
+EFIINC          = /usr/local/include/efi
+GNUEFILIB       = /usr/local/lib
+EFILIB          = /usr/local/lib
+EFICRT0         = /usr/local/lib
 
 HOSTARCH        = $(shell uname -m | sed s,i[3456789]86,ia32,)
 ARCH            := $(HOSTARCH)
@@ -15,7 +15,8 @@ CPPFLAGS        = -I$(EFIINC) -I$(EFIINC)/$(ARCH) -I$(EFIINC)/protocol -DCONFIG_
 
 OPTIMFLAGS      = -O2 -fno-strict-aliasing
 DEBUGFLAGS      = -Wall
-CFLAGS          = $(ARCH3264) $(OPTIMFLAGS) -fpic -fshort-wchar $(DEBUGFLAGS)
+#CFLAGS          = $(ARCH3264) $(OPTIMFLAGS) -fpic -fshort-wchar $(DEBUGFLAGS)
+CFLAGS          = $(ARCH3264) $(OPTIMFLAGS) -fno-stack-protector -fpic -fshort-wchar $(DEBUGFLAGS)
 ASFLAGS         = $(ARCH3264)
 LDFLAGS         = -nostdlib -znocombreloc
 
@@ -73,6 +74,7 @@ endif
 LDFLAGS        += -T $(LDSCRIPT) -shared -Bsymbolic -L$(EFILIB) -L$(GNUEFILIB) $(CRTOBJS)
 LIBS            = -lefi -lgnuefi $(shell $(CC) $(ARCH3264) -print-libgcc-file-name)
 FORMAT          = efi-app-$(ARCH)
+FORMAT_DRIVER   = efi-bsdrv-$ARCH)
 
 
 # general rules
@@ -107,6 +109,6 @@ endif
 # utility rules
 
 clean:
-       rm -f $(TARGET) *~ *.so $(OBJS)
+       rm -f $(TARGET) *~ *.so $(OBJS) *.efi
 
 # EOF