author | mickeyl <mickeyl> | 2002-12-09 14:13:01 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2002-12-09 14:13:01 (UTC) |
commit | 5202da78533aed8d48f63d764128929423fd6822 (patch) (side-by-side diff) | |
tree | 3130722430573994def2dd896163b7a1bd6e8230 | |
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 @@ -10,5 +10,5 @@ MAKEFILE= Makefile TMAKE = tmake -SUBDIRS = libwellenreiter/source daemon/source gui +SUBDIRS = libwellenreiter daemon gui all: $(SUBDIRS) 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 @@ +# Warning: Handcrafted! + +############################################################################# +# Makefile for building targets in sub directories. +# Project: wellenreiter +# Template: subdirs +############################################################################# + +MAKEFILE= Makefile +TMAKE = tmake + +SUBDIRS = libwellenreiter/source daemon/source gui + +all: $(SUBDIRS) + +$(SUBDIRS): FORCE + cd $@; $(MAKE) + +tmake: + tmake wellenreiter.pro + +tmake_all: + 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 + +clean release debug: + for i in $(SUBDIRS); do ( if [ -d $$i ]; then cd $$i ; $(MAKE) $@; fi; ) ; done + +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 @@ +*.o +*~ +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 @@ -3,9 +3,9 @@ TEMPLATE = app CONFIG = warn_on debug #CONFIG = warn_on release -HEADERS = config.hh daemon.hh -SOURCES = daemon.cc +HEADERS = source/config.hh source/daemon.hh +SOURCES = source/daemon.cc INCLUDEPATH += ../../libwellenreiter/source -DEPENDPATH += $(OPIEDIR)/include ../daemon -LIBS += -lpcap -L../../libwellenreiter/source -lwellenreiter +DEPENDPATH += $(OPIEDIR)/include +LIBS += -lpcap -L$(QTDIR)/lib -lwellenreiter INTERFACES = 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 @@ +*.o +*~ +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 @@ -7,5 +7,5 @@ SOURCES = main.cpp wellenreiterbase.cpp wellenreiter.cpp scanlistitem.cp INCLUDEPATH += $(OPIEDIR)/include ../daemon DEPENDPATH += $(OPIEDIR)/include ../daemon -LIBS += -lqpe -lopie -L../libwellenreiter/source -lwellenreiter +LIBS += -lqpe -lopie -lwellenreiter INTERFACES = wellenreitertemplate.ui 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 @@ +*.o +*~ +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 @@ -2,7 +2,7 @@ TEMPLATE = lib CONFIG -= moc CONFIG += debug - -HEADERS = cardmode.hh log.hh proto.hh sniff.hh sock.hh -SOURCES = cardmode.cc log.cc proto.cc sniff.cc sock.cc +VERSION = 0.1 +HEADERS = source/cardmode.hh source/log.hh source/proto.hh source/sniff.hh source/sock.hh +SOURCES = source/cardmode.cc source/log.cc source/proto.cc source/sniff.cc source/sock.cc #INCLUDEPATH += ../ ../library @@ -12,4 +12,4 @@ LIBS = TMAKE_CFLAGS += -D__UNIX__ -DESTDIR = $(OPIEDIR)/noncore/net/wellenreiter/libwellenreiter/source +DESTDIR = $(QTDIR)/lib 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 @@ +*.o +*~ +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,3 +1,3 @@ -Files: bin/wellenreiter pics/wellenreiter +Files: bin/wellenreiter bin/wellenreiterd pics/wellenreiter Priority: optional Section: opie/applications |