--- a/Makefile.conf.in	2012-07-17 10:00:48.546971357 +0400
+++ b/Makefile.conf.in	2012-07-17 10:01:23.333993087 +0400
@@ -98,7 +98,7 @@
 .PHONY: buildall libinstall
 buildall:
 	@echo Building project ${PROJECT}
-	${GPRBUILD} -m -j${PROCESSORS} -XLIBRARY_TYPE=${LIBRARY_TYPE} -P${PROJECT} -p
+	${GPRBUILD} -m -j${PROCESSORS} -XLIBRARY_TYPE=${LIBRARY_TYPE} -P${PROJECT} -p ${GNAT_OPTFLAGS}
 
 libinstall: installprint installsources installobj installlinks
 
--- a/Makefile	2012-07-17 10:01:30.193995883 +0400
+++ b/Makefile	2012-07-17 10:01:57.310002000 +0400
@@ -23,7 +23,7 @@
 ## LIBRARY_TYPE variable
 
 build_library_type:
-	${GPRBUILD} -m -j${PROCESSORS} -XLIBRARY_TYPE=${LIBRARY_TYPE} -Pgnatcoll_build -p
+	 ${GPRBUILD} -m -j${PROCESSORS} -XLIBRARY_TYPE=${LIBRARY_TYPE} -Pgnatcoll_build -p ${GNAT_OPTFLAGS}
 ifeq (${WITH_GTK},yes)
 	${MAKE} -C src -f Makefile.gtk buildall
 endif
--- a/src/Makefile.tools	2012-07-17 10:02:38.017973823 +0400
+++ b/src/Makefile.tools	2012-07-17 10:03:34.895979617 +0400
@@ -16,10 +16,10 @@
 endif
 
 gnatinspect: force
-	${GPRBUILD} -m -j${PROCESSORS} -XLIBRARY_TYPE=${LIBRARY_TYPE} -P$(PROJECT) $@ -p -largs $(POSTGRES_PATH)
+	${GPRBUILD} -m -j${PROCESSORS} -XLIBRARY_TYPE=${LIBRARY_TYPE} -P$(PROJECT) $@ -p -largs ${GNAT_OPTFLAGS}  $(POSTGRES_PATH)
 
 gnatcoll_db2ada: force
-	${GPRBUILD} -m -j${PROCESSORS} -XLIBRARY_TYPE=${LIBRARY_TYPE} -P$(PROJECT) $@ -p -largs $(POSTGRES_PATH)
+	${GPRBUILD} -m -j${PROCESSORS} -XLIBRARY_TYPE=${LIBRARY_TYPE} -P$(PROJECT) $@ -p -largs ${GNAT_OPTFLAGS} $(POSTGRES_PATH)
 
 installbin: force
 	$(CP) obj/gnatcoll_db2ada${EXE} $(bindir)
--- a/Makefile	2012-07-17 22:15:12.991015492 +0400
+++ b/Makefile	2012-07-17 22:15:58.836995865 +0400
@@ -3,8 +3,8 @@
 include Makefile.conf
 
 ifeq (${BUILDS_SHARED},yes)
-all: generate_sources static relocatable tools_relocatable
-install: install_relocatable install_static install_docs
+all: generate_sources relocatable tools_relocatable
+install: install_relocatable install_docs
 else
 all: generate_sources static tools_static
 install: install_static install_docs