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.

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 @@
         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
@@ -2,10 +2,10 @@ DESTDIR         = $(OPIEDIR)/bin
 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
@@ -6,6 +6,6 @@ HEADERS         = wellenreiterbase.h wellenreiter.h scanlistitem.h scanlist.h lo
 SOURCES         = main.cpp wellenreiterbase.cpp wellenreiter.cpp scanlistitem.cpp scanlist.cpp logwindow.cpp hexwindow.cpp
 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
@@ -1,9 +1,9 @@
 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
 #DEPENDPATH      += $(OPIEDIR)/include ../ ../library
@@ -11,5 +11,5 @@ SOURCES = cardmode.cc log.cc proto.cc sniff.cc sock.cc
 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,4 +1,4 @@
-Files: bin/wellenreiter pics/wellenreiter
+Files: bin/wellenreiter bin/wellenreiterd pics/wellenreiter
 Priority: optional
 Section: opie/applications
 Maintainer: Michael Lauer <mickeyl@handhelds.org>