summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/opiecore.pro12
-rw-r--r--libopie2/opieui/opieui.pro20
-rw-r--r--libopie2/qt3/.cvsignore6
-rw-r--r--libopie2/qt3/opiecore/.cvsignore6
-rw-r--r--libopie2/qt3/opieui/.cvsignore6
5 files changed, 23 insertions, 27 deletions
diff --git a/libopie2/opiecore/opiecore.pro b/libopie2/opiecore/opiecore.pro
index 5d630ea..4f70db7 100644
--- a/libopie2/opiecore/opiecore.pro
+++ b/libopie2/opiecore/opiecore.pro
@@ -1,43 +1,33 @@
1TEMPLATE = lib 1TEMPLATE = lib
2CONFIG += qt warn_on debug 2CONFIG += qt warn_on debug
3DESTDIR = $(OPIEDIR)/lib 3DESTDIR = $(OPIEDIR)/lib
4HEADERS = oapplication.h \ 4HEADERS = oapplication.h \
5 opieapplication.h \
6 oconfig.h \ 5 oconfig.h \
7 opieconfig.h \
8 ocompletionbase.h \
9 ocompletion.h \
10 odebug.h \ 6 odebug.h \
11 oglobal.h \ 7 oglobal.h \
12 oglobalsettings.h \ 8 oglobalsettings.h
13 osortablevaluelist.h
14
15 9
16SOURCES = oapplication.cpp \ 10SOURCES = oapplication.cpp \
17 opieapplication.cpp \
18 oconfig.cpp \ 11 oconfig.cpp \
19 opieconfig.cpp \
20 ocompletionbase.cpp \
21 ocompletion.cpp \
22 odebug.cpp \ 12 odebug.cpp \
23 oglobal.cpp \ 13 oglobal.cpp \
24 oglobalsettings.cpp 14 oglobalsettings.cpp
25 15
26INTERFACES = 16INTERFACES =
27TARGET = opiecore2 17TARGET = opiecore2
28VERSION = 1.8.2 18VERSION = 1.8.2
29INCLUDEPATH += $(OPIEDIR)/include 19INCLUDEPATH += $(OPIEDIR)/include
30DEPENDPATH += $(OPIEDIR)/include 20DEPENDPATH += $(OPIEDIR)/include
31MOC_DIR = moc 21MOC_DIR = moc
32OBJECTS_DIR = obj 22OBJECTS_DIR = obj
33 23
34 24
35!contains( platform, x11 ) { 25!contains( platform, x11 ) {
36 LIBS = -lqpe 26 LIBS = -lqpe
37 include ( $(OPIEDIR)/include.pro ) 27 include ( $(OPIEDIR)/include.pro )
38} 28}
39 29
40contains( platform, x11 ) { 30contains( platform, x11 ) {
41 LIBS = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib 31 LIBS = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib
42} 32}
43 33
diff --git a/libopie2/opieui/opieui.pro b/libopie2/opieui/opieui.pro
index 4c15181..6f197a4 100644
--- a/libopie2/opieui/opieui.pro
+++ b/libopie2/opieui/opieui.pro
@@ -1,67 +1,55 @@
1TEMPLATE = lib 1TEMPLATE = lib
2CONFIG += qt warn_on debug 2CONFIG += qt warn_on debug
3DESTDIR = $(OPIEDIR)/lib 3DESTDIR = $(OPIEDIR)/lib
4HEADERS = ocompletionbox.h \ 4HEADERS = olistview.h \
5 ocombobox.h \
6 oeditlistbox.h \
7 olineedit.h \
8 olistview.h \
9 oimageeffect.h \ 5 oimageeffect.h \
10 opixmapeffect.h \ 6 opixmapeffect.h \
11 opopupmenu.h \ 7 opopupmenu.h \
12 opixmapprovider.h \ 8 opixmapprovider.h \
13 oselector.h \ 9 oselector.h \
14 oversatileview.h \ 10 oversatileview.h \
15 oversatileviewitem.h \ 11 oversatileviewitem.h \
16 #ojanuswidget.h \
17 odialog.h \ 12 odialog.h \
18 omenubar.h \ 13 omenubar.h \
19 opiemenubar.h \ 14 opiemenubar.h \
20 omessagebox.h \ 15 omessagebox.h \
21 oresource.h \ 16 oresource.h \
22 otoolbar.h \ 17 otoolbar.h \
23 oseparator.h 18 oseparator.h
24# otaskbarapplet.h
25 19
26SOURCES = ocompletionbox.cpp \ 20SOURCES = olistview.cpp \
27 ocombobox.cpp \
28 oeditlistbox.cpp \
29 olineedit.cpp \
30 olistview.cpp \
31 oimageeffect.cpp \ 21 oimageeffect.cpp \
32 opixmapeffect.cpp \ 22 opixmapeffect.cpp \
33 opopupmenu.cpp \ 23 opopupmenu.cpp \
34 opixmapprovider.cpp \ 24 opixmapprovider.cpp \
35 oselector.cpp \ 25 oselector.cpp \
36 oversatileview.cpp \ 26 oversatileview.cpp \
37 oversatileviewitem.cpp \ 27 oversatileviewitem.cpp \
38 #ojanuswidget.cpp \
39 odialog.cpp \ 28 odialog.cpp \
40 omenubar.cpp \ 29 omenubar.cpp \
41 opiemenubar.cpp \ 30 opiemenubar.cpp \
42 oresource.cpp \ 31 oresource.cpp \
43 otoolbar.cpp \ 32 otoolbar.cpp \
44 oseparator.cpp #\ 33 oseparator.cpp
45# otaskbarapplet.cpp
46 34
47INTERFACES = 35INTERFACES =
48TARGET = opieui2 36TARGET = opieui2
49VERSION = 1.8.2 37VERSION = 1.8.2
50INCLUDEPATH += $(OPIEDIR)/include 38INCLUDEPATH += $(OPIEDIR)/include
51DEPENDPATH += $(OPIEDIR)/include 39DEPENDPATH += $(OPIEDIR)/include
52LIBS += -lopiecore2 40LIBS += -lopiecore2
53MOC_DIR = moc 41MOC_DIR = moc
54OBJECTS_DIR = obj 42OBJECTS_DIR = obj
55 43
56 44
57!contains( platform, x11 ) { 45!contains( platform, x11 ) {
58 include ( $(OPIEDIR)/include.pro ) 46 include ( $(OPIEDIR)/include.pro )
59 HEADERS += otaskbarapplet.h 47 HEADERS += otaskbarapplet.h
60 SOURCES += otaskbarapplet.cpp 48 SOURCES += otaskbarapplet.cpp
61} 49}
62 50
63contains( platform, x11 ) { 51contains( platform, x11 ) {
64 LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib 52 LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib
65 message( Warning: NO otaskbarapplet ATM ) 53 message( Warning: NO otaskbarapplet ATM )
66} 54}
67 55
diff --git a/libopie2/qt3/.cvsignore b/libopie2/qt3/.cvsignore
new file mode 100644
index 0000000..8f7300c
--- a/dev/null
+++ b/libopie2/qt3/.cvsignore
@@ -0,0 +1,6 @@
1Makefile*
2moc*
3*moc
4*.o
5~*
6
diff --git a/libopie2/qt3/opiecore/.cvsignore b/libopie2/qt3/opiecore/.cvsignore
new file mode 100644
index 0000000..8f7300c
--- a/dev/null
+++ b/libopie2/qt3/opiecore/.cvsignore
@@ -0,0 +1,6 @@
1Makefile*
2moc*
3*moc
4*.o
5~*
6
diff --git a/libopie2/qt3/opieui/.cvsignore b/libopie2/qt3/opieui/.cvsignore
new file mode 100644
index 0000000..8f7300c
--- a/dev/null
+++ b/libopie2/qt3/opieui/.cvsignore
@@ -0,0 +1,6 @@
1Makefile*
2moc*
3*moc
4*.o
5~*
6