summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-06-26 12:47:29 (UTC)
committer mickeyl <mickeyl>2003-06-26 12:47:29 (UTC)
commit7ffe702cbe4697410f1a3af986d6af4a4a4b19da (patch) (unidiff)
tree65ec0a84bc6c084fc227d1da51948d5852b2b4a5
parent840dd46277acfc7b37a4a4a7112062bf8a6cc746 (diff)
downloadopie-7ffe702cbe4697410f1a3af986d6af4a4a4b19da.zip
opie-7ffe702cbe4697410f1a3af986d6af4a4a4b19da.tar.gz
opie-7ffe702cbe4697410f1a3af986d6af4a4a4b19da.tar.bz2
very interesting... qmake doesn't recognize that it should generate moc-targets
if HEADERS= contains variables... ts... ts...
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/wellenreiter/lib/lib.pro23
-rwxr-xr-xnoncore/net/wellenreiter/makedist.sh2
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 @@
1MOC_DIR = ./tmp 1MOC_DIR = ./tmp
2OBJECTS_DIR = ./tmp 2OBJECTS_DIR = ./tmp
3DESTDIR = $(OPIEDIR)/output/lib 3DESTDIR = $(OPIEDIR)/output/lib
4TEMPLATE = lib 4TEMPLATE = lib
5CONFIG = qt warn_on debug 5CONFIG = qt warn_on debug
6 6
7HEADERS = $(OPIEDIR)/libopie2/opieui/olistview.h \ 7HEADERS = ../libopie2/opieui/olistview.h \
8 $(OPIEDIR)/libopie2/opienet/onetutils.h \ 8 ../libopie2/opienet/onetutils.h \
9 $(OPIEDIR)/libopie2/opienet/omanufacturerdb.h \ 9 ../libopie2/opienet/omanufacturerdb.h \
10 $(OPIEDIR)/libopie2/opienet/onetwork.h \ 10 ../libopie2/opienet/onetwork.h \
11 $(OPIEDIR)/libopie2/opienet/opcap.h 11 ../libopie2/opienet/opcap.h
12 12
13SOURCES = $(OPIEDIR)/libopie2/opieui/olistview.cpp \ 13SOURCES = ../libopie2/opieui/olistview.cpp \
14 $(OPIEDIR)/libopie2/opienet/onetutils.cpp \ 14 ../libopie2/opienet/onetutils.cpp \
15 $(OPIEDIR)/libopie2/opienet/omanufacturerdb.cpp \ 15 ../libopie2/opienet/omanufacturerdb.cpp \
16 $(OPIEDIR)/libopie2/opienet/onetwork.cpp \ 16 ../libopie2/opienet/onetwork.cpp \
17 $(OPIEDIR)/libopie2/opienet/opcap.cpp 17 ../libopie2/opienet/opcap.cpp
18 18
19INCLUDEPATH += $(OPIEDIR)/include 19INCLUDEPATH += $(OPIEDIR)/include
20DEPENDPATH += $(OPIEDIR)/include 20DEPENDPATH += $(OPIEDIR)/include
21LIBS = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib -lpcap 21LIBS = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib -lpcap
22INTERFACES =
22TARGET = wellenreiter 23TARGET = wellenreiter
23VERSION = 1.0.0 24VERSION = 1.0.0
24
25
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,49 +1,49 @@
1VERSION=2-beta 1VERSION=2-1.0rc2
2 2
3TGZDIR=$PWD 3TGZDIR=$PWD
4 4
5# script to make a .tgz distributable for the Wellenreiter X11 Standalone Version 5# script to make a .tgz distributable for the Wellenreiter X11 Standalone Version
6 6
7find . -name "*.o"|xargs rm -f 7find . -name "*.o"|xargs rm -f
8find . -name "Makefile"|xargs rm -f 8find . -name "Makefile"|xargs rm -f
9find . -name "*moc*"|xargs rm -f 9find . -name "*moc*"|xargs rm -f
10#TMPFILE=`mktemp -d -q /tmp/build.XXXXXX` 10#TMPFILE=`mktemp -d -q /tmp/build.XXXXXX`
11TMPFILE=/tmp/build 11TMPFILE=/tmp/build
12#if [ $? -ne 0 ]; then 12#if [ $? -ne 0 ]; then
13# echo "$0: Can't create temp file, exiting..." 13# echo "$0: Can't create temp file, exiting..."
14# exit 1 14# exit 1
15#fi 15#fi
16 16
17TMPDIR=$TMPFILE/wellenreiter$VERSION 17TMPDIR=$TMPFILE/wellenreiter$VERSION
18OUTPUT=$TMPDIR/output 18OUTPUT=$TMPDIR/output
19 19
20mkdir -p $TMPDIR/libopie2/opieui 20mkdir -p $TMPDIR/libopie2/opieui
21mkdir -p $TMPDIR/libopie2/opienet 21mkdir -p $TMPDIR/libopie2/opienet
22mkdir -p $TMPDIR/include/opie2 22mkdir -p $TMPDIR/include/opie2
23mkdir -p $OUTPUT/share/wellenreiter/pics 23mkdir -p $OUTPUT/share/wellenreiter/pics
24mkdir -p $OUTPUT/share/wellenreiter 24mkdir -p $OUTPUT/share/wellenreiter
25cp -dfR gui $TMPDIR 25cp -dfR gui $TMPDIR
26cp -dfR lib $TMPDIR 26cp -dfR lib $TMPDIR
27cp -dfR build README wellenreiter.pro $TMPDIR 27cp -dfR build README wellenreiter.pro $TMPDIR
28cp -dfR $OPIEDIR/pics/wellenreiter/* $OUTPUT/share/wellenreiter/ 28cp -dfR $OPIEDIR/pics/wellenreiter/* $OUTPUT/share/wellenreiter/
29cp -dfR $OPIEDIR/share/wellenreiter/* $OUTPUT/share/wellenreiter/ 29cp -dfR $OPIEDIR/share/wellenreiter/* $OUTPUT/share/wellenreiter/
30 30
31# take care about sourcefiles 31# take care about sourcefiles
32 32
33FILES="libopie2/opienet/onetwork.h libopie2/opienet/onetwork.cpp \ 33FILES="libopie2/opienet/onetwork.h libopie2/opienet/onetwork.cpp \
34 libopie2/opienet/opcap.h libopie2/opienet/opcap.cpp libopie2/opienet/802_11_user.h \ 34 libopie2/opienet/opcap.h libopie2/opienet/opcap.cpp libopie2/opienet/802_11_user.h \
35 libopie2/opienet/onetutils.h libopie2/opienet/onetutils.cpp \ 35 libopie2/opienet/onetutils.h libopie2/opienet/onetutils.cpp \
36 libopie2/opienet/omanufacturerdb.h libopie2/opienet/omanufacturerdb.cpp \ 36 libopie2/opienet/omanufacturerdb.h libopie2/opienet/omanufacturerdb.cpp \
37 libopie2/opieui/olistview.cpp libopie2/opieui/olistview.h" 37 libopie2/opieui/olistview.cpp libopie2/opieui/olistview.h"
38 38
39for i in $FILES 39for i in $FILES
40 do cp -dfR $OPIEDIR/$i $TMPDIR/$i 40 do cp -dfR $OPIEDIR/$i $TMPDIR/$i
41done 41done
42 42
43# make includes 43# make includes
44pushd $TMPDIR/include/opie2 44pushd $TMPDIR/include/opie2
45ln -sf ../../libopie2/opieui/*.h . 45ln -sf ../../libopie2/opieui/*.h .
46ln -sf ../../libopie2/opienet/*.h . 46ln -sf ../../libopie2/opienet/*.h .
47popd 47popd
48 48
49find $TMPDIR -name "CVS"|xargs rm -rf 49find $TMPDIR -name "CVS"|xargs rm -rf