summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-08-30 11:04:01 (UTC)
committer zautrix <zautrix>2004-08-30 11:04:01 (UTC)
commit59adbf716a965d01c24b475685368681447d0b36 (patch) (side-by-side diff)
treeb8f50f8f0915e5fbffd967e9c3a0381744e2f044
parentd78908896f19bb9e63a69bf475bf417b2599653b (diff)
downloadkdepimpi-59adbf716a965d01c24b475685368681447d0b36.zip
kdepimpi-59adbf716a965d01c24b475685368681447d0b36.tar.gz
kdepimpi-59adbf716a965d01c24b475685368681447d0b36.tar.bz2
Compile fixes
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile14
-rw-r--r--gammu/emb/common/common.pro1
-rw-r--r--gammu/emb/gammu/gammu.pro1
3 files changed, 9 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index f21e524..64db374 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,14 @@
#############################################################################
-# Makefile for building: kopi-desktop
-# Generated by qmake (1.07a) (Qt 3.3.1) on: Sun Aug 29 18:50:00 2004
-# Project: kopi-desktop.pro
+# Makefile for building: kdepim-desktop
+# Generated by qmake (1.07a) (Qt 3.3.1) on: Mon Aug 30 11:47:23 2004
+# Project: kdepim-desktop.pro
# Template: subdirs
-# Command: $(QMAKE) -o Makefile kopi-desktop.pro
+# Command: $(QMAKE) -o Makefile kdepim-desktop.pro
#############################################################################
MAKEFILE = Makefile
QMAKE = qmake
DEL_FILE = rm -f
CHK_DIR_EXISTS= test -d
MKDIR = mkdir -p
SUBTARGETS = \
@@ -89,20 +89,20 @@ sub-kabc-plugins-file: kabc/plugins/file/$(MAKEFILE) FORCE
cd kabc/plugins/file && $(MAKE) -f $(MAKEFILE)
kabc/plugins/dir/$(MAKEFILE):
@$(CHK_DIR_EXISTS) "kabc/plugins/dir" || $(MKDIR) "kabc/plugins/dir"
cd kabc/plugins/dir && $(QMAKE) dir.pro -o $(MAKEFILE)
sub-kabc-plugins-dir: kabc/plugins/dir/$(MAKEFILE) FORCE
cd kabc/plugins/dir && $(MAKE) -f $(MAKEFILE)
-Makefile: kopi-desktop.pro /usr/lib/qt3/mkspecs/default/qmake.conf
- $(QMAKE) -o Makefile kopi-desktop.pro
+Makefile: kdepim-desktop.pro /usr/lib/qt3/mkspecs/default/qmake.conf
+ $(QMAKE) -o Makefile kdepim-desktop.pro
qmake: qmake_all
- @$(QMAKE) -o Makefile kopi-desktop.pro
+ @$(QMAKE) -o Makefile kdepim-desktop.pro
all: $(SUBTARGETS)
qmake_all: gammu/emb/common/$(MAKEFILE) gammu/emb/gammu/$(MAKEFILE) libical/$(MAKEFILE) libkcal/$(MAKEFILE) microkde/$(MAKEFILE) libkdepim/$(MAKEFILE) kabc/$(MAKEFILE) korganizer/$(MAKEFILE) kaddressbook/$(MAKEFILE) kabc/plugins/file/$(MAKEFILE) kabc/plugins/dir/$(MAKEFILE)
( [ -d gammu/emb/common ] && cd gammu/emb/common ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
( [ -d libical ] && cd libical ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
( [ -d libkcal ] && cd libkcal ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
( [ -d microkde ] && cd microkde ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
diff --git a/gammu/emb/common/common.pro b/gammu/emb/common/common.pro
index 0c68000..d27dbeb 100644
--- a/gammu/emb/common/common.pro
+++ b/gammu/emb/common/common.pro
@@ -168,16 +168,17 @@ phone/nokia/dct4/n6510.c \
phone/nokia/dct4/dct4func.c \
phone/nokia/nauto.c \
phone/nokia/nfunc.c \
phone/nokia/nfuncold.c \
phone/obex/obexgen.c \
phone/symbian/mroutgen.c
TARGET = microgammu
+CONFIG += console
DESTDIR = ../../../bin
OBJECTS_DIR = obj/unix
MOC_DIR = moc/unix
unix: {
SOURCES += device/serial/ser_unx.c
}
win32:{
diff --git a/gammu/emb/gammu/gammu.pro b/gammu/emb/gammu/gammu.pro
index bd683c4..6efc8e7 100644
--- a/gammu/emb/gammu/gammu.pro
+++ b/gammu/emb/gammu/gammu.pro
@@ -1,13 +1,14 @@
######################################################################
# Automatically generated by qmake (1.07a) Fri Jul 30 22:22:02 2004
######################################################################
TEMPLATE = app
+CONFIG += console
DEPENDPATH += msvc06.mak \
msvc2003.mak \
smsd \
depend/nokia \
depend/siemens \
depend/nokia/dct3trac
INCLUDEPATH += . smsd depend/nokia depend/nokia/dct3trac depend/siemens
CONFIG = qt warn_off release