CLEANUP: sanitize tinykate's build structure

11 files changed, 22 insertions, 34 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,3 +1 @@
-source "noncore/apps/tinykate/libkate/config.in"
-
   config TINYKATE
@@ -5,4 +3,4 @@ source "noncore/apps/tinykate/libkate/config.in"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBKATE
-    comment "opie-tinykate needs a libqpe, libopie2core, libopie2ui and libkate"
-    depends !(( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBKATE)
+  depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBQTAUX
+  comment "opie-tinykate needs a libqpe, libopie2core, libopie2ui and libqtaux"
+  depends !(( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBQTAUX)
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 \
 INTERFACES  =
-INCLUDEPATH += $(OPIEDIR)/include \
-            $(OPIEDIR)/noncore/apps/tinykate/libkate \
-            $(OPIEDIR)/noncore/apps/tinykate/libkate/microkde \
-            $(OPIEDIR)/noncore/apps/tinykate/libkate/document \
-            $(OPIEDIR)/noncore/apps/tinykate/libkate/view \
-            $(OPIEDIR)/noncore/apps/tinykate/libkate/interfaces \
-            $(OPIEDIR)/noncore/apps/tinykate/libkate/ktexteditor \
-            $(OPIEDIR)/noncore/apps/tinykate/libkate/qt3back
+INCLUDEPATH += microkde document view interfaces ktexteditor qt3back
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS        += -lqpe -lqtaux2 -lopiecore2 -lopieui2
-TARGET      = tinykate
+TARGET      = kate
 
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 @@
+Makefile*
+.moc
+.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 @@
+TEMPLATE       = app
+CONFIG         = qt warn_on quick-app
+DESTDIR        = $(OPIEDIR)/bin
+HEADERS        = tinykate.h
+SOURCES        = tinykate.cpp main.cpp
+INCLUDEPATH    = $(OPIEDIR)/include ../libkate \
+                 ../libkate/ktexteditor ../libkate/document ../libkate/microkde ../libkate/qt3back ../libkate/view ../libkate/interfaces
+DEPENDPATH     += $(OPIEDIR)/include
+LIBS           += -lqpe -lkate -lopiecore2 -lopieui2
+TARGET         = tinykate
+
+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 @@
-TEMPLATE       = app
-CONFIG         = qt warn_on quick-app
-DESTDIR        = $(OPIEDIR)/bin
-HEADERS        = tinykate.h
-SOURCES        = tinykate.cpp main.cpp
-INCLUDEPATH    += $(OPIEDIR)/include \
-               $(OPIEDIR)/noncore/apps/tinykate/libkate \
-               $(OPIEDIR)/noncore/apps/tinykate/libkate/microkde \
-               $(OPIEDIR)/noncore/apps/tinykate/libkate/document \
-               $(OPIEDIR)/noncore/apps/tinykate/libkate/view \
-               $(OPIEDIR)/noncore/apps/tinykate/libkate/interfaces \
-               $(OPIEDIR)/noncore/apps/tinykate/libkate/ktexteditor \
-               $(OPIEDIR)/noncore/apps/tinykate/libkate/qt3back
-DEPENDPATH     += $(OPIEDIR)/include
-LIBS           += -lqpe -ltinykate -lopiecore2 -lopieui2
-TARGET         = kate
-
-
-
-include ( $(OPIEDIR)/include.pro )
+TEMPLATE = subdirs
+SUBDIRS  = libkate mainwindow