CLEANUP: sanitize tinykate's build structure

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
parent: 6cd90404121a78f3181a35acc056d7feca3d6aeb (diff)
download: opie-163a07abb5fbf5346585bce5edf5e48d015b442a.zip
opie-163a07abb5fbf5346585bce5edf5e48d015b442a.tar.gz
opie-163a07abb5fbf5346585bce5edf5e48d015b442a.tar.bz2
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)"
-  config TINYKATE
+  default "y"
-    boolean "opie-tinykate (programmers editor Kate from KDE)"
+  depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBQTAUX
-    default "y"
+  comment "opie-tinykate needs a libqpe, libopie2core, libopie2ui and libqtaux"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBKATE
+  depends !(( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBQTAUX)
-    comment "opie-tinykate needs a libqpe, libopie2core, libopie2ui and libkate"
-    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
@@ -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 \
+INCLUDEPATH += microkde document view interfaces ktexteditor qt3back
-            $(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 -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
+TEMPLATE = subdirs
-CONFIG         = qt warn_on quick-app
+SUBDIRS  = libkate mainwindow
-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 )
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
parent	6cd90404121a78f3181a35acc056d7feca3d6aeb (diff)
download	opie-163a07abb5fbf5346585bce5edf5e48d015b442a.zip opie-163a07abb5fbf5346585bce5edf5e48d015b442a.tar.gz opie-163a07abb5fbf5346585bce5edf5e48d015b442a.tar.bz2

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
@@ -1,87 +1,80 @@
1	TEMPLATE = lib	1	TEMPLATE = lib
2	CONFIG = qt warn_on	2	CONFIG = qt warn_on
3	HEADERS = microkde/kapplication.h \	3	HEADERS = microkde/kapplication.h \
4	kateconfig.h \	4	kateconfig.h \
5	microkde/kdebug.h \	5	microkde/kdebug.h \
6	microkde/kdialog.h \	6	microkde/kdialog.h \
7	microkde/kdialogbase.h \	7	microkde/kdialogbase.h \
8	microkde/kfiledialog.h \	8	microkde/kfiledialog.h \
9	microkde/kglobal.h \	9	microkde/kglobal.h \
10	microkde/kiconloader.h \	10	microkde/kiconloader.h \
11	microkde/klineedit.h \	11	microkde/klineedit.h \
12	microkde/klocale.h \	12	microkde/klocale.h \
13	microkde/kmessagebox.h \	13	microkde/kmessagebox.h \
14	microkde/kprinter.h \	14	microkde/kprinter.h \
15	microkde/krestrictedline.h \	15	microkde/krestrictedline.h \
16	microkde/kseparator.h \	16	microkde/kseparator.h \
17	microkde/kstandarddirs.h \	17	microkde/kstandarddirs.h \
18	microkde/ktempfile.h \	18	microkde/ktempfile.h \
19	microkde/kunload.h \	19	microkde/kunload.h \
20	microkde/kurlrequester.h \	20	microkde/kurlrequester.h \
21	microkde/kfontdialog.h \	21	microkde/kfontdialog.h \
22	microkde/krun.h \	22	microkde/krun.h \
23	microkde/knumvalidator.h \	23	microkde/knumvalidator.h \
24	microkde/kstaticdeleter.h \	24	microkde/kstaticdeleter.h \
25	microkde/klistview.h \	25	microkde/klistview.h \
26	microkde/kglobalsettings.h \	26	microkde/kglobalsettings.h \
27	microkde/kcolorbtn.h \	27	microkde/kcolorbtn.h \
28	\	28	\
29	qt3back/qregexp3.h \	29	qt3back/qregexp3.h \
30	microkde/ksharedptr.h \	30	microkde/ksharedptr.h \
31	document/katebuffer.h document/katedialogs.h \	31	document/katebuffer.h document/katedialogs.h \
32	document/katetextline.h \	32	document/katetextline.h \
33	document/katecmd.h \	33	document/katecmd.h \
34	document/katehighlight.h \	34	document/katehighlight.h \
35	document/katecmds.h document/katedocument.h \	35	document/katecmds.h document/katedocument.h \
36	document/katesyntaxdocument.h \	36	document/katesyntaxdocument.h \
37	view/kateundohistory.h \	37	view/kateundohistory.h \
38	view/kateview.h \	38	view/kateview.h \
39	view/kateviewdialog.h \	39	view/kateviewdialog.h \
40	interfaces/view.h \	40	interfaces/view.h \
41	interfaces/document.h \	41	interfaces/document.h \
42	ktexteditor/ktexteditor.h	42	ktexteditor/ktexteditor.h
43		43
44	SOURCES = microkde/kapplication.cpp \	44	SOURCES = microkde/kapplication.cpp \
45	microkde/kdialogbase.cpp \	45	microkde/kdialogbase.cpp \
46	kateconfig.cpp \	46	kateconfig.cpp \
47	microkde/klocale.cpp \	47	microkde/klocale.cpp \
48	microkde/kmessagebox.cpp \	48	microkde/kmessagebox.cpp \
49	microkde/kprocess.cpp \	49	microkde/kprocess.cpp \
50	microkde/kstandarddirs.cpp \	50	microkde/kstandarddirs.cpp \
51	microkde/ktempfile.cpp \	51	microkde/ktempfile.cpp \
52	microkde/kurlrequester.cpp \	52	microkde/kurlrequester.cpp \
53	microkde/kfontdialog.cpp \	53	microkde/kfontdialog.cpp \
54	microkde/krun.cpp \	54	microkde/krun.cpp \
55	microkde/knumvalidator.cpp \	55	microkde/knumvalidator.cpp \
56	microkde/kglobal.cpp \	56	microkde/kglobal.cpp \
57	microkde/kglobalsettings.cpp \	57	microkde/kglobalsettings.cpp \
58	microkde/kcolorbtn.cpp \	58	microkde/kcolorbtn.cpp \
59	\	59	\
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 )