author | mickeyl <mickeyl> | 2002-12-09 14:13:01 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2002-12-09 14:13:01 (UTC) |
commit | 5202da78533aed8d48f63d764128929423fd6822 (patch) (unidiff) | |
tree | 3130722430573994def2dd896163b7a1bd6e8230 /noncore | |
parent | fffd954b4ea3c124a37cab9af99b248986029436 (diff) | |
download | opie-5202da78533aed8d48f63d764128929423fd6822.zip opie-5202da78533aed8d48f63d764128929423fd6822.tar.gz opie-5202da78533aed8d48f63d764128929423fd6822.tar.bz2 |
Wellenreiter is now fully integrated into the Opie build environment.
If you want to play with what we have yet, be sure to add the following to
the makefile:
* noncore/net/wellenreiter/libwellenreiter
* noncore/net/wellenreiter/daemon
* noncore/net/wellenreiter/gui
Don't add the toplevel noncore/net/wellenreiter, because the Makefile in
there is handcrafted.
-rw-r--r-- | noncore/net/wellenreiter/Makefile | 2 | ||||
-rw-r--r-- | noncore/net/wellenreiter/Makefile.static | 28 | ||||
-rw-r--r-- | noncore/net/wellenreiter/daemon/.cvsignore | 3 | ||||
-rw-r--r-- | noncore/net/wellenreiter/daemon/daemon.pro | 8 | ||||
-rw-r--r-- | noncore/net/wellenreiter/daemon/source/.cvsignore | 3 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/gui.pro | 2 | ||||
-rw-r--r-- | noncore/net/wellenreiter/libwellenreiter/.cvsignore | 3 | ||||
-rw-r--r-- | noncore/net/wellenreiter/libwellenreiter/libwellenreiter.pro | 8 | ||||
-rw-r--r-- | noncore/net/wellenreiter/libwellenreiter/source/.cvsignore | 3 | ||||
-rw-r--r-- | noncore/net/wellenreiter/opie-wellenreiter.control | 2 |
10 files changed, 51 insertions, 11 deletions
diff --git a/noncore/net/wellenreiter/Makefile b/noncore/net/wellenreiter/Makefile index 22b23f4..db085e3 100644 --- a/noncore/net/wellenreiter/Makefile +++ b/noncore/net/wellenreiter/Makefile | |||
@@ -9,7 +9,7 @@ | |||
9 | MAKEFILE=Makefile | 9 | MAKEFILE=Makefile |
10 | TMAKE =tmake | 10 | TMAKE =tmake |
11 | 11 | ||
12 | SUBDIRS =libwellenreiter/source daemon/source gui | 12 | SUBDIRS =libwellenreiter daemon gui |
13 | 13 | ||
14 | all: $(SUBDIRS) | 14 | all: $(SUBDIRS) |
15 | 15 | ||
diff --git a/noncore/net/wellenreiter/Makefile.static b/noncore/net/wellenreiter/Makefile.static new file mode 100644 index 0000000..22b23f4 --- a/dev/null +++ b/noncore/net/wellenreiter/Makefile.static | |||
@@ -0,0 +1,28 @@ | |||
1 | # Warning: Handcrafted! | ||
2 | |||
3 | ############################################################################# | ||
4 | # Makefile for building targets in sub directories. | ||
5 | # Project: wellenreiter | ||
6 | # Template: subdirs | ||
7 | ############################################################################# | ||
8 | |||
9 | MAKEFILE=Makefile | ||
10 | TMAKE =tmake | ||
11 | |||
12 | SUBDIRS =libwellenreiter/source daemon/source gui | ||
13 | |||
14 | all: $(SUBDIRS) | ||
15 | |||
16 | $(SUBDIRS): FORCE | ||
17 | cd $@; $(MAKE) | ||
18 | |||
19 | tmake: | ||
20 | tmake wellenreiter.pro | ||
21 | |||
22 | tmake_all: | ||
23 | for i in $(SUBDIRS); do ( if [ -d $$i ]; then cd $$i ; pro=`basename $$i`.pro ; $(TMAKE) $$pro -o $(MAKEFILE); grep "TEMPLATE.*subdirs" $$pro 2>/dev/null >/dev/null && $(MAKE) -f $(MAKEFILE) tmake_all || true; fi; ) ; done | ||
24 | |||
25 | clean release debug: | ||
26 | for i in $(SUBDIRS); do ( if [ -d $$i ]; then cd $$i ; $(MAKE) $@; fi; ) ; done | ||
27 | |||
28 | FORCE: | ||
diff --git a/noncore/net/wellenreiter/daemon/.cvsignore b/noncore/net/wellenreiter/daemon/.cvsignore new file mode 100644 index 0000000..ed65c71 --- a/dev/null +++ b/noncore/net/wellenreiter/daemon/.cvsignore | |||
@@ -0,0 +1,3 @@ | |||
1 | *.o | ||
2 | *~ | ||
3 | moc_* | ||
diff --git a/noncore/net/wellenreiter/daemon/daemon.pro b/noncore/net/wellenreiter/daemon/daemon.pro index 974c889..92e64c0 100644 --- a/noncore/net/wellenreiter/daemon/daemon.pro +++ b/noncore/net/wellenreiter/daemon/daemon.pro | |||
@@ -2,10 +2,10 @@ DESTDIR = $(OPIEDIR)/bin | |||
2 | TEMPLATE = app | 2 | TEMPLATE = app |
3 | CONFIG = warn_on debug | 3 | CONFIG = warn_on debug |
4 | #CONFIG = warn_on release | 4 | #CONFIG = warn_on release |
5 | HEADERS = config.hh daemon.hh | 5 | HEADERS = source/config.hh source/daemon.hh |
6 | SOURCES = daemon.cc | 6 | SOURCES = source/daemon.cc |
7 | INCLUDEPATH += ../../libwellenreiter/source | 7 | INCLUDEPATH += ../../libwellenreiter/source |
8 | DEPENDPATH += $(OPIEDIR)/include ../daemon | 8 | DEPENDPATH += $(OPIEDIR)/include |
9 | LIBS += -lpcap -L../../libwellenreiter/source -lwellenreiter | 9 | LIBS += -lpcap -L$(QTDIR)/lib -lwellenreiter |
10 | INTERFACES = | 10 | INTERFACES = |
11 | TARGET = wellenreiterd | 11 | TARGET = wellenreiterd |
diff --git a/noncore/net/wellenreiter/daemon/source/.cvsignore b/noncore/net/wellenreiter/daemon/source/.cvsignore new file mode 100644 index 0000000..ed65c71 --- a/dev/null +++ b/noncore/net/wellenreiter/daemon/source/.cvsignore | |||
@@ -0,0 +1,3 @@ | |||
1 | *.o | ||
2 | *~ | ||
3 | moc_* | ||
diff --git a/noncore/net/wellenreiter/gui/gui.pro b/noncore/net/wellenreiter/gui/gui.pro index 6b9944d..8f14bc1 100644 --- a/noncore/net/wellenreiter/gui/gui.pro +++ b/noncore/net/wellenreiter/gui/gui.pro | |||
@@ -6,6 +6,6 @@ HEADERS = wellenreiterbase.h wellenreiter.h scanlistitem.h scanlist.h lo | |||
6 | SOURCES = main.cpp wellenreiterbase.cpp wellenreiter.cpp scanlistitem.cpp scanlist.cpp logwindow.cpp hexwindow.cpp | 6 | SOURCES = main.cpp wellenreiterbase.cpp wellenreiter.cpp scanlistitem.cpp scanlist.cpp logwindow.cpp hexwindow.cpp |
7 | INCLUDEPATH += $(OPIEDIR)/include ../daemon | 7 | INCLUDEPATH += $(OPIEDIR)/include ../daemon |
8 | DEPENDPATH += $(OPIEDIR)/include ../daemon | 8 | DEPENDPATH += $(OPIEDIR)/include ../daemon |
9 | LIBS += -lqpe -lopie -L../libwellenreiter/source -lwellenreiter | 9 | LIBS += -lqpe -lopie -lwellenreiter |
10 | INTERFACES = wellenreitertemplate.ui | 10 | INTERFACES = wellenreitertemplate.ui |
11 | TARGET = wellenreiter | 11 | TARGET = wellenreiter |
diff --git a/noncore/net/wellenreiter/libwellenreiter/.cvsignore b/noncore/net/wellenreiter/libwellenreiter/.cvsignore new file mode 100644 index 0000000..ed65c71 --- a/dev/null +++ b/noncore/net/wellenreiter/libwellenreiter/.cvsignore | |||
@@ -0,0 +1,3 @@ | |||
1 | *.o | ||
2 | *~ | ||
3 | moc_* | ||
diff --git a/noncore/net/wellenreiter/libwellenreiter/libwellenreiter.pro b/noncore/net/wellenreiter/libwellenreiter/libwellenreiter.pro index 7bb86c3..d7cf0c5 100644 --- a/noncore/net/wellenreiter/libwellenreiter/libwellenreiter.pro +++ b/noncore/net/wellenreiter/libwellenreiter/libwellenreiter.pro | |||
@@ -1,9 +1,9 @@ | |||
1 | TEMPLATE = lib | 1 | TEMPLATE = lib |
2 | CONFIG -= moc | 2 | CONFIG -= moc |
3 | CONFIG += debug | 3 | CONFIG += debug |
4 | 4 | VERSION = 0.1 | |
5 | HEADERS = cardmode.hh log.hh proto.hh sniff.hh sock.hh | 5 | HEADERS = source/cardmode.hh source/log.hh source/proto.hh source/sniff.hh source/sock.hh |
6 | SOURCES = cardmode.cc log.cc proto.cc sniff.cc sock.cc | 6 | SOURCES = source/cardmode.cc source/log.cc source/proto.cc source/sniff.cc source/sock.cc |
7 | 7 | ||
8 | #INCLUDEPATH += ../ ../library | 8 | #INCLUDEPATH += ../ ../library |
9 | #DEPENDPATH += $(OPIEDIR)/include ../ ../library | 9 | #DEPENDPATH += $(OPIEDIR)/include ../ ../library |
@@ -11,5 +11,5 @@ SOURCES = cardmode.cc log.cc proto.cc sniff.cc sock.cc | |||
11 | LIBS = | 11 | LIBS = |
12 | TMAKE_CFLAGS += -D__UNIX__ | 12 | TMAKE_CFLAGS += -D__UNIX__ |
13 | 13 | ||
14 | DESTDIR = $(OPIEDIR)/noncore/net/wellenreiter/libwellenreiter/source | 14 | DESTDIR = $(QTDIR)/lib |
15 | TARGET = wellenreiter | 15 | TARGET = wellenreiter |
diff --git a/noncore/net/wellenreiter/libwellenreiter/source/.cvsignore b/noncore/net/wellenreiter/libwellenreiter/source/.cvsignore new file mode 100644 index 0000000..ed65c71 --- a/dev/null +++ b/noncore/net/wellenreiter/libwellenreiter/source/.cvsignore | |||
@@ -0,0 +1,3 @@ | |||
1 | *.o | ||
2 | *~ | ||
3 | moc_* | ||
diff --git a/noncore/net/wellenreiter/opie-wellenreiter.control b/noncore/net/wellenreiter/opie-wellenreiter.control index c1cdc6b..81f7f82 100644 --- a/noncore/net/wellenreiter/opie-wellenreiter.control +++ b/noncore/net/wellenreiter/opie-wellenreiter.control | |||
@@ -1,4 +1,4 @@ | |||
1 | Files: bin/wellenreiter pics/wellenreiter | 1 | Files: bin/wellenreiter bin/wellenreiterd pics/wellenreiter |
2 | Priority: optional | 2 | Priority: optional |
3 | Section: opie/applications | 3 | Section: opie/applications |
4 | Maintainer: Michael Lauer <mickeyl@handhelds.org> | 4 | Maintainer: Michael Lauer <mickeyl@handhelds.org> |