[fwbuilder-commits] r2354 - in branches/v3_1: . src/gui src/ipt

[<va...@in...>]

Author: vadim
Date: 2010-01-15 17:49:25 -0800 (Fri, 15 Jan 2010)
New Revision: 2354

Modified:
   branches/v3_1/build_num
   branches/v3_1/src/gui/gui.pro
   branches/v3_1/src/ipt/ipt.pro
Log:
rearrange the order of libraries to make it compile on Mandriva. See #1085

Modified: branches/v3_1/build_num
===================================================================
--- branches/v3_1/build_num	2010-01-16 00:26:01 UTC (rev 2353)
+++ branches/v3_1/build_num	2010-01-16 01:49:25 UTC (rev 2354)
@@ -1 +1 @@
-#define BUILD_NUM 2352
+#define BUILD_NUM 2353

Modified: branches/v3_1/src/gui/gui.pro
===================================================================
--- branches/v3_1/src/gui/gui.pro	2010-01-16 00:26:01 UTC (rev 2353)
+++ branches/v3_1/src/gui/gui.pro	2010-01-16 01:49:25 UTC (rev 2354)
@@ -455,7 +455,6 @@
         $$ANTLR_LIBS
     DEFINES += $$ANTLR_DEFINES
 }
-LIBS += $$LIBS_FWCOMPILER
 
 # fwtransfer lib. Add this before adding -lQtDBus to LIBS below
 LIBS += $$FWTRANSFER_LIB
@@ -498,12 +497,16 @@
     ../cisco_lib/libfwbcisco.a \
     ../compiler_lib/libcompilerdriver.a
 macx:LIBS += -framework Carbon
+
+LIBS += $$LIBS_FWCOMPILER
+
 RESOURCES += MainRes.qrc
-TRANSLATIONS = fwbuilder_ru.ts \
-    fwbuilder_ja.ts
+
+TRANSLATIONS = fwbuilder_ru.ts fwbuilder_ja.ts
+
 ja.path = $$PKGLOCALEDIR
 ja.files = fwbuilder_ja.qm
 ru.path = $$PKGLOCALEDIR
 ru.files = fwbuilder_ru.qm
-INSTALLS += ja \
-    ru
+
+INSTALLS += ja ru

Modified: branches/v3_1/src/ipt/ipt.pro
===================================================================
--- branches/v3_1/src/ipt/ipt.pro	2010-01-16 00:26:01 UTC (rev 2353)
+++ branches/v3_1/src/ipt/ipt.pro	2010-01-16 01:49:25 UTC (rev 2354)
@@ -12,8 +12,6 @@
 
 win32: CONFIG += console
 
-LIBS += $$LIBS_FWCOMPILER
-
 INCLUDEPATH += ../common ../iptlib ../compiler_lib/
 DEPENDPATH   = ../common ../iptlib ../compiler_lib
 
@@ -23,6 +21,8 @@
 win32:PRE_TARGETDEPS  = ../common/release/common.lib ../iptlib/release/iptlib.lib ../compiler_lib/release/compilerdriver.lib
 !win32:PRE_TARGETDEPS = ../common/libcommon.a ../iptlib/libiptlib.a ../compiler_lib/libcompilerdriver.a
 
+LIBS += $$LIBS_FWCOMPILER
+
 TARGET = fwb_ipt