summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-06-26 12:47:29 (UTC)
committer mickeyl <mickeyl>2003-06-26 12:47:29 (UTC)
commit7ffe702cbe4697410f1a3af986d6af4a4a4b19da (patch) (side-by-side diff)
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 @@
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,25 +1,25 @@
-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