author | mickeyl <mickeyl> | 2004-05-23 11:26:00 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-05-23 11:26:00 (UTC) |
commit | 163a07abb5fbf5346585bce5edf5e48d015b442a (patch) (side-by-side diff) | |
tree | 0ae95b1f32ded0e1766b240ccfcfec856dafea09 /noncore/apps/tinykate | |
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 @@ -source "noncore/apps/tinykate/libkate/config.in" - - config TINYKATE - boolean "opie-tinykate (programmers editor Kate from KDE)" - 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) +config TINYKATE + boolean "opie-tinykate (programmers editor Kate from KDE)" + default "y" + 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 @@ -1,87 +1,80 @@ TEMPLATE = lib CONFIG = qt warn_on HEADERS = microkde/kapplication.h \ kateconfig.h \ microkde/kdebug.h \ microkde/kdialog.h \ microkde/kdialogbase.h \ microkde/kfiledialog.h \ microkde/kglobal.h \ microkde/kiconloader.h \ microkde/klineedit.h \ microkde/klocale.h \ microkde/kmessagebox.h \ microkde/kprinter.h \ microkde/krestrictedline.h \ microkde/kseparator.h \ microkde/kstandarddirs.h \ microkde/ktempfile.h \ microkde/kunload.h \ microkde/kurlrequester.h \ microkde/kfontdialog.h \ microkde/krun.h \ microkde/knumvalidator.h \ microkde/kstaticdeleter.h \ microkde/klistview.h \ microkde/kglobalsettings.h \ microkde/kcolorbtn.h \ \ qt3back/qregexp3.h \ microkde/ksharedptr.h \ document/katebuffer.h document/katedialogs.h \ document/katetextline.h \ document/katecmd.h \ document/katehighlight.h \ document/katecmds.h document/katedocument.h \ document/katesyntaxdocument.h \ view/kateundohistory.h \ view/kateview.h \ view/kateviewdialog.h \ interfaces/view.h \ interfaces/document.h \ ktexteditor/ktexteditor.h SOURCES = microkde/kapplication.cpp \ microkde/kdialogbase.cpp \ kateconfig.cpp \ microkde/klocale.cpp \ microkde/kmessagebox.cpp \ microkde/kprocess.cpp \ microkde/kstandarddirs.cpp \ microkde/ktempfile.cpp \ microkde/kurlrequester.cpp \ microkde/kfontdialog.cpp \ microkde/krun.cpp \ microkde/knumvalidator.cpp \ microkde/kglobal.cpp \ microkde/kglobalsettings.cpp \ microkde/kcolorbtn.cpp \ \ qt3back/qregexp3.cpp \ ktexteditor/ktexteditor.cpp \ document/katebuffer.cpp document/katedialogs.cpp \ document/katehighlight.cpp \ document/katecmd.cpp \ document/katesyntaxdocument.cpp document/katecmds.cpp \ document/katedocument.cpp document/katetextline.cpp \ view/kateundohistory.cpp \ view/kateview.cpp \ view/kateviewdialog.cpp \ interfaces/interfaces.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 INCLUDEPATH += $(OPIEDIR)/include DESTDIR = $(OPIEDIR)/lib$(PROJMAK) 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 @@ +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 |