summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2004-05-23 11:26:00 (UTC)
committer mickeyl <mickeyl>2004-05-23 11:26:00 (UTC)
commit163a07abb5fbf5346585bce5edf5e48d015b442a (patch) (unidiff)
tree0ae95b1f32ded0e1766b240ccfcfec856dafea09
parent6cd90404121a78f3181a35acc056d7feca3d6aeb (diff)
downloadopie-163a07abb5fbf5346585bce5edf5e48d015b442a.zip
opie-163a07abb5fbf5346585bce5edf5e48d015b442a.tar.gz
opie-163a07abb5fbf5346585bce5edf5e48d015b442a.tar.bz2
CLEANUP: sanitize tinykate's build structure
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/tinykate/config.in14
-rw-r--r--noncore/apps/tinykate/libkate/libkate.pro11
-rw-r--r--noncore/apps/tinykate/mainwindow/.cvsignore3
-rw-r--r--noncore/apps/tinykate/mainwindow/cgotobase.ui (renamed from noncore/apps/tinykate/cgotobase.ui)0
-rw-r--r--noncore/apps/tinykate/mainwindow/cgotoline.cpp (renamed from noncore/apps/tinykate/cgotoline.cpp)0
-rw-r--r--noncore/apps/tinykate/mainwindow/cgotoline.h (renamed from noncore/apps/tinykate/cgotoline.h)0
-rw-r--r--noncore/apps/tinykate/mainwindow/main.cpp (renamed from noncore/apps/tinykate/main.cpp)0
-rw-r--r--noncore/apps/tinykate/mainwindow/mainwindow.pro12
-rw-r--r--noncore/apps/tinykate/mainwindow/tinykate.cpp (renamed from noncore/apps/tinykate/tinykate.cpp)0
-rw-r--r--noncore/apps/tinykate/mainwindow/tinykate.h (renamed from noncore/apps/tinykate/tinykate.h)0
-rw-r--r--noncore/apps/tinykate/tinykate.pro22
11 files changed, 25 insertions, 37 deletions
diff --git a/noncore/apps/tinykate/config.in b/noncore/apps/tinykate/config.in
index 0c4a559..003e21d 100644
--- a/noncore/apps/tinykate/config.in
+++ b/noncore/apps/tinykate/config.in
@@ -1,8 +1,6 @@
1source "noncore/apps/tinykate/libkate/config.in" 1config TINYKATE
2 2 boolean "opie-tinykate (programmers editor Kate from KDE)"
3 config TINYKATE 3 default "y"
4 boolean "opie-tinykate (programmers editor Kate from KDE)" 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBQTAUX
5 default "y" 5 comment "opie-tinykate needs a libqpe, libopie2core, libopie2ui and libqtaux"
6 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBKATE 6 depends !(( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBQTAUX)
7 comment "opie-tinykate needs a libqpe, libopie2core, libopie2ui and libkate"
8 depends !(( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBKATE)
diff --git a/noncore/apps/tinykate/libkate/libkate.pro b/noncore/apps/tinykate/libkate/libkate.pro
index 1552dff..c038b68 100644
--- a/noncore/apps/tinykate/libkate/libkate.pro
+++ b/noncore/apps/tinykate/libkate/libkate.pro
@@ -71,13 +71,6 @@ SOURCES = microkde/kapplication.cpp \
71INTERFACES = 71INTERFACES =
72INCLUDEPATH += $(OPIEDIR)/include \ 72INCLUDEPATH += microkde document view interfaces ktexteditor qt3back
73 $(OPIEDIR)/noncore/apps/tinykate/libkate \
74 $(OPIEDIR)/noncore/apps/tinykate/libkate/microkde \
75 $(OPIEDIR)/noncore/apps/tinykate/libkate/document \
76 $(OPIEDIR)/noncore/apps/tinykate/libkate/view \
77 $(OPIEDIR)/noncore/apps/tinykate/libkate/interfaces \
78 $(OPIEDIR)/noncore/apps/tinykate/libkate/ktexteditor \
79 $(OPIEDIR)/noncore/apps/tinykate/libkate/qt3back
80DEPENDPATH += $(OPIEDIR)/include 73DEPENDPATH += $(OPIEDIR)/include
81LIBS += -lqpe -lqtaux2 -lopiecore2 -lopieui2 74LIBS += -lqpe -lqtaux2 -lopiecore2 -lopieui2
82TARGET = tinykate 75TARGET = kate
83 76
diff --git a/noncore/apps/tinykate/mainwindow/.cvsignore b/noncore/apps/tinykate/mainwindow/.cvsignore
new file mode 100644
index 0000000..e737538
--- a/dev/null
+++ b/noncore/apps/tinykate/mainwindow/.cvsignore
@@ -0,0 +1,3 @@
1Makefile*
2.moc
3.obj
diff --git a/noncore/apps/tinykate/cgotobase.ui b/noncore/apps/tinykate/mainwindow/cgotobase.ui
index 6660cb8..6660cb8 100644
--- a/noncore/apps/tinykate/cgotobase.ui
+++ b/noncore/apps/tinykate/mainwindow/cgotobase.ui
diff --git a/noncore/apps/tinykate/cgotoline.cpp b/noncore/apps/tinykate/mainwindow/cgotoline.cpp
index 97f2ea5..97f2ea5 100644
--- a/noncore/apps/tinykate/cgotoline.cpp
+++ b/noncore/apps/tinykate/mainwindow/cgotoline.cpp
diff --git a/noncore/apps/tinykate/cgotoline.h b/noncore/apps/tinykate/mainwindow/cgotoline.h
index 29d6f42..29d6f42 100644
--- a/noncore/apps/tinykate/cgotoline.h
+++ b/noncore/apps/tinykate/mainwindow/cgotoline.h
diff --git a/noncore/apps/tinykate/main.cpp b/noncore/apps/tinykate/mainwindow/main.cpp
index c14d10a..c14d10a 100644
--- a/noncore/apps/tinykate/main.cpp
+++ b/noncore/apps/tinykate/mainwindow/main.cpp
diff --git a/noncore/apps/tinykate/mainwindow/mainwindow.pro b/noncore/apps/tinykate/mainwindow/mainwindow.pro
new file mode 100644
index 0000000..94d00bd
--- a/dev/null
+++ b/noncore/apps/tinykate/mainwindow/mainwindow.pro
@@ -0,0 +1,12 @@
1TEMPLATE = app
2CONFIG = qt warn_on quick-app
3DESTDIR = $(OPIEDIR)/bin
4HEADERS = tinykate.h
5SOURCES = tinykate.cpp main.cpp
6INCLUDEPATH = $(OPIEDIR)/include ../libkate \
7 ../libkate/ktexteditor ../libkate/document ../libkate/microkde ../libkate/qt3back ../libkate/view ../libkate/interfaces
8DEPENDPATH += $(OPIEDIR)/include
9LIBS += -lqpe -lkate -lopiecore2 -lopieui2
10TARGET = tinykate
11
12include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/apps/tinykate/tinykate.cpp b/noncore/apps/tinykate/mainwindow/tinykate.cpp
index 9865c35..9865c35 100644
--- a/noncore/apps/tinykate/tinykate.cpp
+++ b/noncore/apps/tinykate/mainwindow/tinykate.cpp
diff --git a/noncore/apps/tinykate/tinykate.h b/noncore/apps/tinykate/mainwindow/tinykate.h
index f435c03..f435c03 100644
--- a/noncore/apps/tinykate/tinykate.h
+++ b/noncore/apps/tinykate/mainwindow/tinykate.h
diff --git a/noncore/apps/tinykate/tinykate.pro b/noncore/apps/tinykate/tinykate.pro
index d34e519..51c5cdb 100644
--- a/noncore/apps/tinykate/tinykate.pro
+++ b/noncore/apps/tinykate/tinykate.pro
@@ -1,20 +1,2 @@
1TEMPLATE = app 1TEMPLATE = subdirs
2CONFIG = qt warn_on quick-app 2SUBDIRS = libkate mainwindow
3DESTDIR = $(OPIEDIR)/bin
4HEADERS = tinykate.h
5SOURCES = tinykate.cpp main.cpp
6INCLUDEPATH += $(OPIEDIR)/include \
7 $(OPIEDIR)/noncore/apps/tinykate/libkate \
8 $(OPIEDIR)/noncore/apps/tinykate/libkate/microkde \
9 $(OPIEDIR)/noncore/apps/tinykate/libkate/document \
10 $(OPIEDIR)/noncore/apps/tinykate/libkate/view \
11 $(OPIEDIR)/noncore/apps/tinykate/libkate/interfaces \
12 $(OPIEDIR)/noncore/apps/tinykate/libkate/ktexteditor \
13 $(OPIEDIR)/noncore/apps/tinykate/libkate/qt3back
14DEPENDPATH += $(OPIEDIR)/include
15LIBS += -lqpe -ltinykate -lopiecore2 -lopieui2
16TARGET = kate
17
18
19
20include ( $(OPIEDIR)/include.pro )