onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-03-21 02:37:16 +01:00
Code Issues Releases Wiki Activity

minor clean up

Browse Source
This commit is contained in:
Vadim Kurland 2010-12-25 20:52:55 -08:00
parent a95ea92b96
commit 225cc320b7
3 changed files with 5 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
configure.in
View File

@ -157,12 +157,12 @@ dnl Check for GNU make
dnl dnl
AC_MSG_CHECKING(whether make is GNU Make) AC_MSG_CHECKING(whether make is GNU Make)
if ${MAKE-make} -q --version 2>/dev/null | grep '^GNU Make ' >/dev/null ; then if ${MAKE-make} -q --version 2>/dev/null | grep '^GNU Make ' >/dev/null ; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
else else
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
if test "$host_vendor" = "sun" ; then if test "$host_vendor" = "sun" ; then
AC_MSG_ERROR("SUN make does not work for building Firewall Builder. Please install GNU make") AC_MSG_ERROR("SUN make does not work for building Firewall Builder. Please install GNU make")
fi fi
fi fi
dnl some platform-dependent flags dnl some platform-dependent flags
@ -174,18 +174,6 @@ case "$build_os" in
*solaris*) *solaris*)
GUILINKFLAGS="-export-dynamic" GUILINKFLAGS="-export-dynamic"
;; ;;
*darwin*)
if test -d /sw/include; then
CXXFLAGS="-I/sw/include"
CPPFLAGS="-I/sw/include"
CFLAGS="-I/sw/include"
LDFLAGS="-flat_namespace"
fi
LIBS="$LIBS -L/sw/lib"
AC_CHECK_LIB(poll, poll, [LIBS="$LIBS -lpoll"],[
AC_MSG_ERROR([Could not link with libpoll: library is not installed on this system])
])
;;
esac esac
AC_SUBST(GUILINKFLAGS) AC_SUBST(GUILINKFLAGS)

3
src/cisco_lib/cisco_lib.pro
View File

@ -66,9 +66,6 @@ macx:LIBS += $$LIBS_FWCOMPILER
INCLUDEPATH += ../compiler_lib ../libfwbuilder/src INCLUDEPATH += ../compiler_lib ../libfwbuilder/src
# win32:LIBS += ../compiler_lib/release/compilerdriver.lib
# !win32:LIBS += ../compiler_lib/libcompilerdriver.a
win32:PRE_TARGETDEPS = ../compiler_lib/release/compilerdriver.lib win32:PRE_TARGETDEPS = ../compiler_lib/release/compilerdriver.lib
!win32:PRE_TARGETDEPS = ../compiler_lib/libcompilerdriver.a !win32:PRE_TARGETDEPS = ../compiler_lib/libcompilerdriver.a

5
src/libfwbuilder/src/fwcompiler/fwcompiler.pro
View File

@ -5,7 +5,6 @@ include(../../qmake.inc)
TEMPLATE = lib TEMPLATE = lib
CONFIG += staticlib CONFIG += staticlib
VERSION = $$SO_VERSION
# #
SOURCES = BaseCompiler.cpp \ SOURCES = BaseCompiler.cpp \
Compiler.cpp \ Compiler.cpp \
@ -27,10 +26,6 @@ HEADERS = BaseCompiler.h \
RuleProcessor.h \ RuleProcessor.h \
RoutingCompiler.h RoutingCompiler.h
unix {
LIBS += -L../fwbuilder -lfwbuilder
}
TARGET = fwcompiler TARGET = fwcompiler
# target.path = "$$prefix/lib" # target.path = "$$prefix/lib"