author | mickeyl <mickeyl> | 2003-06-26 12:47:29 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-06-26 12:47:29 (UTC) |
commit | 7ffe702cbe4697410f1a3af986d6af4a4a4b19da (patch) (unidiff) | |
tree | 65ec0a84bc6c084fc227d1da51948d5852b2b4a5 | |
parent | 840dd46277acfc7b37a4a4a7112062bf8a6cc746 (diff) | |
download | opie-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...
-rw-r--r-- | noncore/net/wellenreiter/lib/lib.pro | 23 | ||||
-rwxr-xr-x | noncore/net/wellenreiter/makedist.sh | 2 |
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 @@ | |||
1 | MOC_DIR = ./tmp | 1 | MOC_DIR = ./tmp |
2 | OBJECTS_DIR = ./tmp | 2 | OBJECTS_DIR = ./tmp |
3 | DESTDIR = $(OPIEDIR)/output/lib | 3 | DESTDIR = $(OPIEDIR)/output/lib |
4 | TEMPLATE = lib | 4 | TEMPLATE = lib |
5 | CONFIG = qt warn_on debug | 5 | CONFIG = qt warn_on debug |
6 | 6 | ||
7 | HEADERS = $(OPIEDIR)/libopie2/opieui/olistview.h \ | 7 | HEADERS = ../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 | ||
13 | SOURCES = $(OPIEDIR)/libopie2/opieui/olistview.cpp \ | 13 | SOURCES = ../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 | ||
19 | INCLUDEPATH += $(OPIEDIR)/include | 19 | INCLUDEPATH += $(OPIEDIR)/include |
20 | DEPENDPATH += $(OPIEDIR)/include | 20 | DEPENDPATH += $(OPIEDIR)/include |
21 | LIBS = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib -lpcap | 21 | LIBS = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib -lpcap |
22 | INTERFACES = | ||
22 | TARGET = wellenreiter | 23 | TARGET = wellenreiter |
23 | VERSION = 1.0.0 | 24 | VERSION = 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 @@ | |||
1 | VERSION=2-beta | 1 | VERSION=2-1.0rc2 |
2 | 2 | ||
3 | TGZDIR=$PWD | 3 | TGZDIR=$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 | ||
7 | find . -name "*.o"|xargs rm -f | 7 | find . -name "*.o"|xargs rm -f |
8 | find . -name "Makefile"|xargs rm -f | 8 | find . -name "Makefile"|xargs rm -f |
9 | find . -name "*moc*"|xargs rm -f | 9 | find . -name "*moc*"|xargs rm -f |
10 | #TMPFILE=`mktemp -d -q /tmp/build.XXXXXX` | 10 | #TMPFILE=`mktemp -d -q /tmp/build.XXXXXX` |
11 | TMPFILE=/tmp/build | 11 | TMPFILE=/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 | ||
17 | TMPDIR=$TMPFILE/wellenreiter$VERSION | 17 | TMPDIR=$TMPFILE/wellenreiter$VERSION |
18 | OUTPUT=$TMPDIR/output | 18 | OUTPUT=$TMPDIR/output |
19 | 19 | ||
20 | mkdir -p $TMPDIR/libopie2/opieui | 20 | mkdir -p $TMPDIR/libopie2/opieui |
21 | mkdir -p $TMPDIR/libopie2/opienet | 21 | mkdir -p $TMPDIR/libopie2/opienet |
22 | mkdir -p $TMPDIR/include/opie2 | 22 | mkdir -p $TMPDIR/include/opie2 |
23 | mkdir -p $OUTPUT/share/wellenreiter/pics | 23 | mkdir -p $OUTPUT/share/wellenreiter/pics |
24 | mkdir -p $OUTPUT/share/wellenreiter | 24 | mkdir -p $OUTPUT/share/wellenreiter |
25 | cp -dfR gui $TMPDIR | 25 | cp -dfR gui $TMPDIR |
26 | cp -dfR lib $TMPDIR | 26 | cp -dfR lib $TMPDIR |
27 | cp -dfR build README wellenreiter.pro $TMPDIR | 27 | cp -dfR build README wellenreiter.pro $TMPDIR |
28 | cp -dfR $OPIEDIR/pics/wellenreiter/* $OUTPUT/share/wellenreiter/ | 28 | cp -dfR $OPIEDIR/pics/wellenreiter/* $OUTPUT/share/wellenreiter/ |
29 | cp -dfR $OPIEDIR/share/wellenreiter/* $OUTPUT/share/wellenreiter/ | 29 | cp -dfR $OPIEDIR/share/wellenreiter/* $OUTPUT/share/wellenreiter/ |
30 | 30 | ||
31 | # take care about sourcefiles | 31 | # take care about sourcefiles |
32 | 32 | ||
33 | FILES="libopie2/opienet/onetwork.h libopie2/opienet/onetwork.cpp \ | 33 | FILES="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 | ||
39 | for i in $FILES | 39 | for i in $FILES |
40 | do cp -dfR $OPIEDIR/$i $TMPDIR/$i | 40 | do cp -dfR $OPIEDIR/$i $TMPDIR/$i |
41 | done | 41 | done |
42 | 42 | ||
43 | # make includes | 43 | # make includes |
44 | pushd $TMPDIR/include/opie2 | 44 | pushd $TMPDIR/include/opie2 |
45 | ln -sf ../../libopie2/opieui/*.h . | 45 | ln -sf ../../libopie2/opieui/*.h . |
46 | ln -sf ../../libopie2/opienet/*.h . | 46 | ln -sf ../../libopie2/opienet/*.h . |
47 | popd | 47 | popd |
48 | 48 | ||
49 | find $TMPDIR -name "CVS"|xargs rm -rf | 49 | find $TMPDIR -name "CVS"|xargs rm -rf |