1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40
|
Description: Use build flags defined at build time
instead of thos hard coded into the makefile.
Author: Gilles Filippini <pini@debian.org>
Last-Update: <2011-10-22>
Index: jxgrabkey/misc/Ant/build.xml
===================================================================
--- jxgrabkey.orig/misc/Ant/build.xml 2011-10-21 21:18:10.000000000 +0200
+++ jxgrabkey/misc/Ant/build.xml 2011-10-22 11:07:21.000000000 +0200
@@ -45,6 +45,10 @@
<!-- build cpp project -->
<exec dir="${nbproject.cpp.dir}" executable="make">
<arg value="CONF=Release"/>
+ <arg value="CXX=${CXX}"/>
+ <arg value="CPPFLAGS=${CPPFLAGS}"/>
+ <arg value="CXXFLAGS=${CXXFLAGS}"/>
+ <arg value="LDFLAGS=${LDFLAGS}"/>
<arg value="build"/>
</exec>
</target>
Index: jxgrabkey/JXGrabKey/C++/nbproject/Makefile-Release.mk
===================================================================
--- jxgrabkey.orig/JXGrabKey/C++/nbproject/Makefile-Release.mk 2011-10-21 21:18:10.000000000 +0200
+++ jxgrabkey/JXGrabKey/C++/nbproject/Makefile-Release.mk 2011-10-21 21:18:17.000000000 +0200
@@ -15,6 +15,7 @@
CC=gcc
CCC=g++
CXX=g++
+CPPFLAGS=-O2
FC=
# Macros
@@ -53,7 +54,7 @@
${OBJECTDIR}/src/JXGrabKey.o: src/JXGrabKey.cpp
${MKDIR} -p ${OBJECTDIR}/src
- $(COMPILE.cc) -O2 -s -I/usr/lib/jvm/default-java/include -I/usr/lib/jvm/default-java/include/linux -fPIC -o ${OBJECTDIR}/src/JXGrabKey.o src/JXGrabKey.cpp
+ $(COMPILE.cc) -s -I/usr/lib/jvm/default-java/include -I/usr/lib/jvm/default-java/include/linux -fPIC -o ${OBJECTDIR}/src/JXGrabKey.o src/JXGrabKey.cpp
# Subprojects
.build-subprojects:
|