Author: durner
Date: 2006-07-09 05:53:44 -0700 (Sun, 09 Jul 2006)
New Revision: 3106
Modified:
gnunet-qt/src/common/common.pro.in
gnunet-qt/src/core/core.pro.in
gnunet-qt/src/plugins/about/about.pro.in
gnunet-qt/src/plugins/fs/fs.pro.in
gnunet-qt/src/plugins/general/general.pro.in
Log:
fix "install" target
Modified: gnunet-qt/src/common/common.pro.in
===================================================================
--- gnunet-qt/src/common/common.pro.in 2006-07-08 20:45:45 UTC (rev 3105)
+++ gnunet-qt/src/common/common.pro.in 2006-07-09 12:53:44 UTC (rev 3106)
@@ -1,13 +1,14 @@
TEMPLATE = lib
TARGET = @[EMAIL PROTECTED]
-CONFIG += @QT_CONFIG@
+dlltarget = $(TARGET)
+CONFIG += @QT_CONFIG@ dll
DLLDESTDIR = .
-QMAKE_LFLAGS += -shared @LDFLAGS@
-QMAKE_LIBS += @LIBS@
-QMAKE_CFLAGS += @CPPFLAGS@
-QMAKE_CXXFLAGS += @CXXFLAGS@
+QMAKE_LFLAGS += -shared
INCLUDEPATH = ../include
+dlltarget.path = @prefix@/bin
+INSTALLS += dlltarget
+
SOURCES = assert.cc pluginLoader.cc gstring.cc
HEADERS = pluginLoader.h ../include/gnunet_qt_common.h
\ No newline at end of file
Modified: gnunet-qt/src/core/core.pro.in
===================================================================
--- gnunet-qt/src/core/core.pro.in 2006-07-08 20:45:45 UTC (rev 3105)
+++ gnunet-qt/src/core/core.pro.in 2006-07-09 12:53:44 UTC (rev 3106)
@@ -5,11 +5,10 @@
DEPENDPATH += .
INCLUDEPATH += ../include @top_builddir@ .
LIBS += -L../common/ -lgnunetqt_common -lgnunetutil
-QMAKE_LFLAGS += @LDFLAGS@
-QMAKE_LIBS += @LIBS@
-QMAKE_CFLAGS += @CPPFLAGS@
-QMAKE_CXXFLAGS += @CXXFLAGS@
+target.path = @prefix@/bin
+INSTALLS += target
+
# Input
SOURCES += main.cc wndMain.cc
HEADERS += wndMain.h
Modified: gnunet-qt/src/plugins/about/about.pro.in
===================================================================
--- gnunet-qt/src/plugins/about/about.pro.in 2006-07-08 20:45:45 UTC (rev
3105)
+++ gnunet-qt/src/plugins/about/about.pro.in 2006-07-09 12:53:44 UTC (rev
3106)
@@ -1,14 +1,15 @@
TEMPLATE = lib
TARGET = @[EMAIL PROTECTED]
-CONFIG += @QT_CONFIG@
+dlltarget = $(TARGET)
+CONFIG += @QT_CONFIG@ dll
INCLUDEPATH = ../../../ ../../include .
DLLDESTDIR = .
LIBS = -L../../common -lgnunetqt_common
-QMAKE_LFLAGS += -shared @LDFLAGS@
-QMAKE_LIBS += @LIBS@
-QMAKE_CFLAGS += @CPPFLAGS@
-QMAKE_CXXFLAGS += @CXXFLAGS@
+QMAKE_LFLAGS += -shared
+dlltarget.path = @prefix@/lib
+INSTALLS += dlltarget
+
SOURCES = about.cc
HEADERS = about.h ../../include/gnunet_qt_common.h
FORMS = about.ui
Modified: gnunet-qt/src/plugins/fs/fs.pro.in
===================================================================
--- gnunet-qt/src/plugins/fs/fs.pro.in 2006-07-08 20:45:45 UTC (rev 3105)
+++ gnunet-qt/src/plugins/fs/fs.pro.in 2006-07-09 12:53:44 UTC (rev 3106)
@@ -1,14 +1,15 @@
TEMPLATE = lib
TARGET = @[EMAIL PROTECTED]
-CONFIG += @QT_CONFIG@
+dlltarget = $(TARGET)
+CONFIG += @QT_CONFIG@ dll
INCLUDEPATH = ../../include .
DLLDESTDIR = .
LIBS = -L../../common -lgnunetqt_common -lextractor -lgnunetutil -lgnunetecrs
-lgnunetfsui
-QMAKE_LFLAGS += -shared @LDFLAGS@
-QMAKE_LIBS += @LIBS@
-QMAKE_CFLAGS += @CPPFLAGS@
-QMAKE_CXXFLAGS += @CXXFLAGS@
+QMAKE_LFLAGS += -shared
+dlltarget.path = @prefix@/lib
+INSTALLS += dlltarget
+
SOURCES = ecrsuri.cc \
fshelper.cc \
fs.cc \
Modified: gnunet-qt/src/plugins/general/general.pro.in
===================================================================
--- gnunet-qt/src/plugins/general/general.pro.in 2006-07-08 20:45:45 UTC
(rev 3105)
+++ gnunet-qt/src/plugins/general/general.pro.in 2006-07-09 12:53:44 UTC
(rev 3106)
@@ -1,14 +1,15 @@
TEMPLATE = lib
TARGET = @[EMAIL PROTECTED]
-CONFIG += @QT_CONFIG@
+dlltarget = $(TARGET)
+CONFIG += @QT_CONFIG@ dll
INCLUDEPATH = ../../include .
DLLDESTDIR = .
LIBS = -lgnunetutil -lgnunetgetoption_api -L../../common -lgnunetqt_common
-QMAKE_LFLAGS += -shared @LDFLAGS@
-QMAKE_LIBS += @LIBS@
-QMAKE_CFLAGS += @CPPFLAGS@
-QMAKE_CXXFLAGS += @CXXFLAGS@
+QMAKE_LFLAGS += -shared
+dlltarget.path = @prefix@/lib
+INSTALLS += dlltarget
+
SOURCES = general.cc startStopThread.cc checkDaemonThread.cc
HEADERS = general.h startStopThread.h checkDaemonThread.h
../../include/gnunet_qt_common.h
FORMS = general.ui
\ No newline at end of file
_______________________________________________
GNUnet-SVN mailing list
GNUnet-SVN@gnu.org
http://lists.gnu.org/mailman/listinfo/gnunet-svn
