very interesting... qmake doesn't recognize that it should generate moc-targets

if HEADERS= contains variables... ts... ts...

2 files changed, 12 insertions, 13 deletions

diff --git a/noncore/net/wellenreiter/lib/lib.pro b/noncore/net/wellenreiter/lib/lib.pro
index e36db11..6ea6869 100644
--- a/noncore/net/wellenreiter/lib/lib.pro
+++ b/noncore/net/wellenreiter/lib/lib.pro
@@ -1,25 +1,24 @@
 MOC_DIR         = ./tmp
 OBJECTS_DIR     = ./tmp
 DESTDIR         = $(OPIEDIR)/output/lib
 TEMPLATE        = lib
 CONFIG          = qt warn_on debug
 
-HEADERS         = $(OPIEDIR)/libopie2/opieui/olistview.h \
-                  $(OPIEDIR)/libopie2/opienet/onetutils.h \
-                  $(OPIEDIR)/libopie2/opienet/omanufacturerdb.h \
-                  $(OPIEDIR)/libopie2/opienet/onetwork.h \
-                  $(OPIEDIR)/libopie2/opienet/opcap.h
+HEADERS         = ../libopie2/opieui/olistview.h \
+                  ../libopie2/opienet/onetutils.h \
+                  ../libopie2/opienet/omanufacturerdb.h \
+                  ../libopie2/opienet/onetwork.h \
+                  ../libopie2/opienet/opcap.h
 
-SOURCES         = $(OPIEDIR)/libopie2/opieui/olistview.cpp \
-                  $(OPIEDIR)/libopie2/opienet/onetutils.cpp \
-                  $(OPIEDIR)/libopie2/opienet/omanufacturerdb.cpp \
-                  $(OPIEDIR)/libopie2/opienet/onetwork.cpp \
-                  $(OPIEDIR)/libopie2/opienet/opcap.cpp
+SOURCES         = ../libopie2/opieui/olistview.cpp \
+                  ../libopie2/opienet/onetutils.cpp \
+                  ../libopie2/opienet/omanufacturerdb.cpp \
+                  ../libopie2/opienet/onetwork.cpp \
+                  ../libopie2/opienet/opcap.cpp
 
 INCLUDEPATH     += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS            = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib -lpcap
+INTERFACES      =
 TARGET          = wellenreiter
 VERSION         = 1.0.0
-
-
diff --git a/noncore/net/wellenreiter/makedist.sh b/noncore/net/wellenreiter/makedist.sh
index cfb0b16..ee60c44 100755
--- a/noncore/net/wellenreiter/makedist.sh
+++ b/noncore/net/wellenreiter/makedist.sh
@@ -1,54 +1,54 @@
-VERSION=2-beta
+VERSION=2-1.0rc2
 
 TGZDIR=$PWD
 
 # script to make a .tgz distributable for the Wellenreiter X11 Standalone Version
 
 find . -name "*.o"|xargs rm -f
 find . -name "Makefile"|xargs rm -f
 find . -name "*moc*"|xargs rm -f
 #TMPFILE=`mktemp -d -q /tmp/build.XXXXXX`
 TMPFILE=/tmp/build
 #if [ $? -ne 0 ]; then
 #        echo "$0: Can't create temp file, exiting..."
 #        exit 1
 #fi
 
 TMPDIR=$TMPFILE/wellenreiter$VERSION
 OUTPUT=$TMPDIR/output
 
 mkdir -p $TMPDIR/libopie2/opieui
 mkdir -p $TMPDIR/libopie2/opienet
 mkdir -p $TMPDIR/include/opie2
 mkdir -p $OUTPUT/share/wellenreiter/pics
 mkdir -p $OUTPUT/share/wellenreiter
 cp -dfR gui $TMPDIR
 cp -dfR lib $TMPDIR
 cp -dfR build README wellenreiter.pro $TMPDIR
 cp -dfR $OPIEDIR/pics/wellenreiter/* $OUTPUT/share/wellenreiter/
 cp -dfR $OPIEDIR/share/wellenreiter/* $OUTPUT/share/wellenreiter/
 
 # take care about sourcefiles
 
 FILES="libopie2/opienet/onetwork.h libopie2/opienet/onetwork.cpp \
       libopie2/opienet/opcap.h libopie2/opienet/opcap.cpp libopie2/opienet/802_11_user.h \
       libopie2/opienet/onetutils.h libopie2/opienet/onetutils.cpp \
       libopie2/opienet/omanufacturerdb.h libopie2/opienet/omanufacturerdb.cpp \
       libopie2/opieui/olistview.cpp libopie2/opieui/olistview.h"
 
 for i in $FILES
     do cp -dfR $OPIEDIR/$i $TMPDIR/$i
 done
 
 # make includes
 pushd $TMPDIR/include/opie2
 ln -sf ../../libopie2/opieui/*.h .
 ln -sf ../../libopie2/opienet/*.h .
 popd
 
 find $TMPDIR -name "CVS"|xargs rm -rf
 
 pushd $TMPFILE
 tar czf $TGZDIR/wellenreiter$VERSION.tgz wellenreiter$VERSION
 popd