author | mickeyl <mickeyl> | 2004-05-23 11:26:00 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-05-23 11:26:00 (UTC) |
commit | 163a07abb5fbf5346585bce5edf5e48d015b442a (patch) (unidiff) | |
tree | 0ae95b1f32ded0e1766b240ccfcfec856dafea09 /noncore/apps | |
parent | 6cd90404121a78f3181a35acc056d7feca3d6aeb (diff) | |
download | opie-163a07abb5fbf5346585bce5edf5e48d015b442a.zip opie-163a07abb5fbf5346585bce5edf5e48d015b442a.tar.gz opie-163a07abb5fbf5346585bce5edf5e48d015b442a.tar.bz2 |
CLEANUP: sanitize tinykate's build structure
-rw-r--r-- | noncore/apps/tinykate/config.in | 14 | ||||
-rw-r--r-- | noncore/apps/tinykate/libkate/libkate.pro | 11 | ||||
-rw-r--r-- | noncore/apps/tinykate/mainwindow/.cvsignore | 3 | ||||
-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.pro | 12 | ||||
-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.pro | 22 |
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 @@ | |||
1 | source "noncore/apps/tinykate/libkate/config.in" | 1 | config 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 | |||
@@ -60,28 +60,21 @@ SOURCES = microkde/kapplication.cpp \ | |||
60 | qt3back/qregexp3.cpp \ | 60 | qt3back/qregexp3.cpp \ |
61 | ktexteditor/ktexteditor.cpp \ | 61 | ktexteditor/ktexteditor.cpp \ |
62 | document/katebuffer.cpp document/katedialogs.cpp \ | 62 | document/katebuffer.cpp document/katedialogs.cpp \ |
63 | document/katehighlight.cpp \ | 63 | document/katehighlight.cpp \ |
64 | document/katecmd.cpp \ | 64 | document/katecmd.cpp \ |
65 | document/katesyntaxdocument.cpp document/katecmds.cpp \ | 65 | document/katesyntaxdocument.cpp document/katecmds.cpp \ |
66 | document/katedocument.cpp document/katetextline.cpp \ | 66 | document/katedocument.cpp document/katetextline.cpp \ |
67 | view/kateundohistory.cpp \ | 67 | view/kateundohistory.cpp \ |
68 | view/kateview.cpp \ | 68 | view/kateview.cpp \ |
69 | view/kateviewdialog.cpp \ | 69 | view/kateviewdialog.cpp \ |
70 | interfaces/interfaces.cpp | 70 | interfaces/interfaces.cpp |
71 | INTERFACES = | 71 | INTERFACES = |
72 | INCLUDEPATH += $(OPIEDIR)/include \ | 72 | INCLUDEPATH += 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 | ||
80 | DEPENDPATH += $(OPIEDIR)/include | 73 | DEPENDPATH += $(OPIEDIR)/include |
81 | LIBS += -lqpe -lqtaux2 -lopiecore2 -lopieui2 | 74 | LIBS += -lqpe -lqtaux2 -lopiecore2 -lopieui2 |
82 | TARGET = tinykate | 75 | TARGET = kate |
83 | 76 | ||
84 | INCLUDEPATH += $(OPIEDIR)/include | 77 | INCLUDEPATH += $(OPIEDIR)/include |
85 | DESTDIR = $(OPIEDIR)/lib$(PROJMAK) | 78 | DESTDIR = $(OPIEDIR)/lib$(PROJMAK) |
86 | 79 | ||
87 | include ( $(OPIEDIR)/include.pro ) | 80 | include ( $(OPIEDIR)/include.pro ) |
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 @@ | |||
1 | Makefile* | ||
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 @@ | |||
1 | TEMPLATE = app | ||
2 | CONFIG = qt warn_on quick-app | ||
3 | DESTDIR = $(OPIEDIR)/bin | ||
4 | HEADERS = tinykate.h | ||
5 | SOURCES = tinykate.cpp main.cpp | ||
6 | INCLUDEPATH = $(OPIEDIR)/include ../libkate \ | ||
7 | ../libkate/ktexteditor ../libkate/document ../libkate/microkde ../libkate/qt3back ../libkate/view ../libkate/interfaces | ||
8 | DEPENDPATH += $(OPIEDIR)/include | ||
9 | LIBS += -lqpe -lkate -lopiecore2 -lopieui2 | ||
10 | TARGET = tinykate | ||
11 | |||
12 | include ( $(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 @@ | |||
1 | TEMPLATE = app | 1 | TEMPLATE = subdirs |
2 | CONFIG = qt warn_on quick-app | 2 | SUBDIRS = libkate mainwindow |
3 | DESTDIR = $(OPIEDIR)/bin | ||
4 | HEADERS = tinykate.h | ||
5 | SOURCES = tinykate.cpp main.cpp | ||
6 | INCLUDEPATH += $(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 | ||
14 | DEPENDPATH += $(OPIEDIR)/include | ||
15 | LIBS += -lqpe -ltinykate -lopiecore2 -lopieui2 | ||
16 | TARGET = kate | ||
17 | |||
18 | |||
19 | |||
20 | include ( $(OPIEDIR)/include.pro ) | ||