From fc1d74ac81cefc529c6d99e37e0c848077395371 Mon Sep 17 00:00:00 2001 From: Andrey Paskal Date: Sun, 27 Dec 2009 18:22:16 +0300 Subject: [PATCH] =?utf8?q?=D0=91=D0=BE=D1=80=D0=B5=D0=BC=D1=81=D1=8F=20=D1=81=20qmake?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/lib/lib.pro | 27 ++++++++------------------- 1 files changed, 8 insertions(+), 19 deletions(-) diff --git a/src/lib/lib.pro b/src/lib/lib.pro index 6a42545..6db317a 100644 --- a/src/lib/lib.pro +++ b/src/lib/lib.pro @@ -28,7 +28,6 @@ win32 { # CONFIG += dll } -#LIBS += -L$(QTDIR)/plugins/designer -lqsa # Why? -L../designer -lformdesigner unix{ LIBS += -L/usr/X11R6/lib/ } @@ -36,10 +35,6 @@ win32 { #LIBS += -L..\..\plugins -lananasplugin } -#MOC_DIR = ../../tmp/moc/$$TARGET -#OBJECTS_DIR = ../../tmp/obj/$$TARGET -#UI_DIR = ../../tmp/ui/$$TARGET - include ( ../ananas.pri ) HEADERS = \ @@ -105,14 +100,8 @@ TRANSLATIONS = \ ../../translations/ananas-lib-ru.ts unix{ - target.path = $(LIBDIR) -# target.files = libananas4.so.$$VERSION -# target.extra = cp -df $(DESTDIR)/libananas4.so* $(INSTALL_ROOT)$(LIBDIR) -# alib.path = $(LIBDIR) -# alib.files = libananas4.so.$$VERSION -# alib.extra = cp -df $(DESTDIR)/libananas4.so* $(INSTALL_ROOT)$(LIBDIR) - - alibheader.path = $(INCLUDEDIR) + target.path = /$(LIBDIR) + alibheader.path = /$(INCLUDEDIR) alibheader.files = $$HEADERS alibheader.files += .ui/*h } @@ -132,9 +121,9 @@ unix{ INSTALLS += alibheader } -include(metadata/metadata.pri) -include(dialogs/dialogs.pri) -include(objects/objects.pri) -include(widgets/widgets.pri) -include(report/report.pri) -include(sys/sys.pri) +#include(metadata/metadata.pri) +#include(dialogs/dialogs.pri) +#include(objects/objects.pri) +#include(widgets/widgets.pri) +#include(report/report.pri) +#include(sys/sys.pri) -- 1.7.1