1 files changed, 23 insertions, 28 deletions
diff --git a/libopie2/opiedb/opiedb.pro b/libopie2/opiedb/opiedb.pro
index d869e6f..249d8b5 100644
--- a/libopie2/opiedb/opiedb.pro
+++ b/libopie2/opiedb/opiedb.pro
@@ -1,41 +1,36 @@
 TEMPLATE    = lib
-#CONFIG      += qt warn_on debug
+CONFIG     += qt warn_on debug
-CONFIG      += qt warn_on release
 DESTDIR     = $(OPIEDIR)/lib
-HEADERS     = osqlbackend.h      \
+HEADERS     = osqlbackend.h    \
-                osqldriver.h     \
+              osqldriver.h     \
-                osqlerror.h      \
+              osqlerror.h      \
-                osqlmanager.h    \
+              osqlmanager.h    \
-                osqlquery.h      \
+              osqlquery.h      \
-                osqlresult.h     \
+              osqlresult.h     \
-                osqltable.h      \
+              osqltable.h      \
-                osqlbackendmanager.h \
+              osqlbackendmanager.h \
-                osqlitedriver.h
+              osqlitedriver.h
-SOURCES     = osqlbackend.cpp    \
+SOURCES     = osqlbackend.cpp   \
-                osqldriver.cpp   \
+              osqldriver.cpp   \
-                osqlerror.cpp    \
+              osqlerror.cpp    \
-                osqlmanager.cpp  \
+              osqlmanager.cpp  \
-                osqlquery.cpp    \
+              osqlquery.cpp    \
-                osqlresult.cpp   \
+              osqlresult.cpp   \
-                osqltable.cpp    \
+              osqltable.cpp    \
-                osqlbackendmanager.cpp \
+              osqlbackendmanager.cpp \
-                osqlitedriver.cpp
+              osqlitedriver.cpp
 INTERFACES  =
 TARGET      = opiedb2
 VERSION     = 1.8.2
-INCLUDEPATH += $(OPIEDIR)/include
+INCLUDEPATH = $(OPIEDIR)/include
-DEPENDPATH  += $(OPIEDIR)/include
+DEPENDPATH  = $(OPIEDIR)/include
+LIBS       += -lsqlite -lqpe
-MOC_DIR     = moc
-OBJECTS_DIR = obj
-LIBS += -lsqlite -lqpe
 !contains( platform, x11 ) {
  include ( $(OPIEDIR)/include.pro )
 }
 contains( platform, x11 ) {
-  LIBS        += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib 
+  LIBS        += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib
 }

diff --git a/libopie2/opiedb/opiedb.pro b/libopie2/opiedb/opiedb.pro index d869e6f..249d8b5 100644 --- a/libopie2/opiedb/opiedb.pro +++ b/libopie2/opiedb/opiedb.pro
@@ -1,41 +1,36 @@
1	TEMPLATE = lib	1	TEMPLATE = lib
2	#CONFIG += qt warn_on debug	2	CONFIG += qt warn_on debug
3	CONFIG += qt warn_on release
4	DESTDIR = $(OPIEDIR)/lib	3	DESTDIR = $(OPIEDIR)/lib
5	HEADERS = osqlbackend.h \	4	HEADERS = osqlbackend.h \
6	osqldriver.h \	5	osqldriver.h \
7	osqlerror.h \	6	osqlerror.h \
8	osqlmanager.h \	7	osqlmanager.h \
9	osqlquery.h \	8	osqlquery.h \
10	osqlresult.h \	9	osqlresult.h \
11	osqltable.h \	10	osqltable.h \
12	osqlbackendmanager.h \	11	osqlbackendmanager.h \
13	osqlitedriver.h	12	osqlitedriver.h
14	SOURCES = osqlbackend.cpp \	13	SOURCES = osqlbackend.cpp \
15	osqldriver.cpp \	14	osqldriver.cpp \
16	osqlerror.cpp \	15	osqlerror.cpp \
17	osqlmanager.cpp \	16	osqlmanager.cpp \
18	osqlquery.cpp \	17	osqlquery.cpp \
19	osqlresult.cpp \	18	osqlresult.cpp \
20	osqltable.cpp \	19	osqltable.cpp \
21	osqlbackendmanager.cpp \	20	osqlbackendmanager.cpp \
22	osqlitedriver.cpp	21	osqlitedriver.cpp
23	INTERFACES =	22	INTERFACES =
24	TARGET = opiedb2	23	TARGET = opiedb2
25	VERSION = 1.8.2	24	VERSION = 1.8.2
26	INCLUDEPATH += $(OPIEDIR)/include	25	INCLUDEPATH = $(OPIEDIR)/include
27	DEPENDPATH += $(OPIEDIR)/include	26	DEPENDPATH = $(OPIEDIR)/include
28		27	LIBS += -lsqlite -lqpe
29	MOC_DIR = moc
30	OBJECTS_DIR = obj
31
32	LIBS += -lsqlite -lqpe
33		28
34	!contains( platform, x11 ) {	29	!contains( platform, x11 ) {
35	include ( $(OPIEDIR)/include.pro )	30	include ( $(OPIEDIR)/include.pro )
36	}	31	}
37		32
38	contains( platform, x11 ) {	33	contains( platform, x11 ) {
39	LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib	34	LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib
40	}	35	}
41		36