| 66b856a6 |
1 | --- b.fwbuilder-2.1.18/runqmake.sh 2008-03-06 07:48:54.000000000 +0100 |
| 2 | +++ n.fwbuilder-2.1.18/runqmake.sh 2008-04-09 19:58:44.000000000 +0200 |
| 3 | @@ -17,56 +17,29 @@ |
| 4 | ${QMAKE} -o doc/Makefile doc/doc.pro |
| 5 | ${QMAKE} -o po/Makefile po/po.pro |
| 6 | |
| 7 | -if test -n "$CCACHE"; then |
| 8 | - |
| 9 | test -d src/unit_tests && { |
| 10 | - ${QMAKE} 'QMAKE_CXX=ccache g++' -o src/unit_tests/importer/Makefile \ |
| 11 | + ${QMAKE} QMAKE_CXX="$CXX" -o src/unit_tests/importer/Makefile \ |
| 12 | src/unit_tests/importer/importer.pro |
| 13 | } |
| 14 | |
| 15 | - ${QMAKE} 'QMAKE_CXX=ccache g++' -o src/antlr/Makefile src/antlr/antlr.pro |
| 16 | + ${QMAKE} QMAKE_CXX="$CXX" -o src/antlr/Makefile src/antlr/antlr.pro |
| 17 | |
| 18 | - ${QMAKE} 'QMAKE_CXX=ccache g++' -o src/gui/Makefile src/gui/gui.pro |
| 19 | - ${QMAKE} 'QMAKE_CXX=ccache g++' -o src/fwblookup/Makefile \ |
| 20 | + ${QMAKE} QMAKE_CXX="$CXX" -o src/gui/Makefile src/gui/gui.pro |
| 21 | + ${QMAKE} QMAKE_CXX="$CXX" -o src/fwblookup/Makefile \ |
| 22 | src/fwblookup/fwblookup.pro |
| 23 | - ${QMAKE} 'QMAKE_CXX=ccache g++' -o src/fwbedit/Makefile \ |
| 24 | + ${QMAKE} QMAKE_CXX="$CXX" -o src/fwbedit/Makefile \ |
| 25 | src/fwbedit/fwbedit.pro |
| 26 | - ${QMAKE} 'QMAKE_CXX=ccache g++' -o src/ipt/Makefile src/ipt/ipt.pro |
| 27 | - ${QMAKE} 'QMAKE_CXX=ccache g++' -o src/pflib/Makefile src/pflib/pflib.pro |
| 28 | - ${QMAKE} 'QMAKE_CXX=ccache g++' -o src/pf/Makefile src/pf/pf.pro |
| 29 | - ${QMAKE} 'QMAKE_CXX=ccache g++' -o src/ipf/Makefile src/ipf/ipf.pro |
| 30 | - ${QMAKE} 'QMAKE_CXX=ccache g++' -o src/ipfw/Makefile src/ipfw/ipfw.pro |
| 31 | - ${QMAKE} 'QMAKE_CXX=ccache g++' -o src/cisco_lib/Makefile \ |
| 32 | + ${QMAKE} QMAKE_CXX="$CXX" -o src/ipt/Makefile src/ipt/ipt.pro |
| 33 | + ${QMAKE} QMAKE_CXX="$CXX" -o src/pflib/Makefile src/pflib/pflib.pro |
| 34 | + ${QMAKE} QMAKE_CXX="$CXX" -o src/pf/Makefile src/pf/pf.pro |
| 35 | + ${QMAKE} QMAKE_CXX="$CXX" -o src/ipf/Makefile src/ipf/ipf.pro |
| 36 | + ${QMAKE} QMAKE_CXX="$CXX" -o src/ipfw/Makefile src/ipfw/ipfw.pro |
| 37 | + ${QMAKE} QMAKE_CXX="$CXX" -o src/cisco_lib/Makefile \ |
| 38 | src/cisco_lib/cisco_lib.pro |
| 39 | - ${QMAKE} 'QMAKE_CXX=ccache g++' -o src/iosacl/Makefile \ |
| 40 | + ${QMAKE} QMAKE_CXX="$CXX" -o src/iosacl/Makefile \ |
| 41 | src/iosacl/iosacl.pro |
| 42 | - ${QMAKE} 'QMAKE_CXX=ccache g++' -o src/pix/Makefile src/pix/pix.pro |
| 43 | + ${QMAKE} QMAKE_CXX="$CXX" -o src/pix/Makefile src/pix/pix.pro |
| 44 | |
| 45 | - ${QMAKE} 'QMAKE_CXX=ccache g++' -o src/parsers/Makefile \ |
| 46 | + ${QMAKE} QMAKE_CXX="$CXX" -o src/parsers/Makefile \ |
| 47 | src/parsers/parsers.pro |
| 48 | |
| 49 | -else |
| 50 | - |
| 51 | - test -d src/unit_tests && { |
| 52 | - ${QMAKE} -o src/unit_tests/importer/Makefile \ |
| 53 | - src/unit_tests/importer/importer.pro |
| 54 | - } |
| 55 | - |
| 56 | - ${QMAKE} -o src/antlr/Makefile src/antlr/antlr.pro |
| 57 | - |
| 58 | - ${QMAKE} -o src/gui/Makefile src/gui/gui.pro |
| 59 | - ${QMAKE} -o src/fwblookup/Makefile src/fwblookup/fwblookup.pro |
| 60 | - ${QMAKE} -o src/fwbedit/Makefile src/fwbedit/fwbedit.pro |
| 61 | - ${QMAKE} -o src/ipt/Makefile src/ipt/ipt.pro |
| 62 | - ${QMAKE} -o src/pflib/Makefile src/pflib/pflib.pro |
| 63 | - ${QMAKE} -o src/pf/Makefile src/pf/pf.pro |
| 64 | - ${QMAKE} -o src/ipf/Makefile src/ipf/ipf.pro |
| 65 | - ${QMAKE} -o src/ipfw/Makefile src/ipfw/ipfw.pro |
| 66 | - ${QMAKE} -o src/cisco_lib/Makefile src/cisco_lib/cisco_lib.pro |
| 67 | - ${QMAKE} -o src/iosacl/Makefile src/iosacl/iosacl.pro |
| 68 | - ${QMAKE} -o src/pix/Makefile src/pix/pix.pro |
| 69 | - |
| 70 | - ${QMAKE} -o src/parsers/Makefile src/parsers/parsers.pro |
| 71 | - |
| 72 | -fi |
| 73 | - |
| 74 | --- fwbuilder-2.1.18/configure.in~ 2008-04-09 20:04:20.000000000 +0200 |
| 75 | +++ fwbuilder-2.1.18/configure.in 2008-04-09 20:04:25.000000000 +0200 |
| 76 | @@ -423,8 +423,6 @@ |
| 77 | |
| 78 | AC_SUBST(MANDIR) |
| 79 | |
| 80 | -AC_PATH_PROG(CCACHE, ccache, , ) |
| 81 | - |
| 82 | dnl Support for the po directory. |
| 83 | AM_PO_SUBDIRS |
| 84 | |
projects / packages / fwbuilder.git / blame