summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-08-30 11:04:01 (UTC)
committer zautrix <zautrix>2004-08-30 11:04:01 (UTC)
commit59adbf716a965d01c24b475685368681447d0b36 (patch) (unidiff)
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,18 +1,18 @@
1############################################################################# 1#############################################################################
2# Makefile for building: kopi-desktop 2# Makefile for building: kdepim-desktop
3# Generated by qmake (1.07a) (Qt 3.3.1) on: Sun Aug 29 18:50:00 2004 3# Generated by qmake (1.07a) (Qt 3.3.1) on: Mon Aug 30 11:47:23 2004
4# Project: kopi-desktop.pro 4# Project: kdepim-desktop.pro
5# Template: subdirs 5# Template: subdirs
6# Command: $(QMAKE) -o Makefile kopi-desktop.pro 6# Command: $(QMAKE) -o Makefile kdepim-desktop.pro
7############################################################################# 7#############################################################################
8 8
9 MAKEFILE =Makefile 9 MAKEFILE =Makefile
10 QMAKE =qmake 10 QMAKE =qmake
11DEL_FILE = rm -f 11DEL_FILE = rm -f
12CHK_DIR_EXISTS= test -d 12CHK_DIR_EXISTS= test -d
13MKDIR = mkdir -p 13MKDIR = mkdir -p
14 SUBTARGETS = \ 14 SUBTARGETS = \
15 sub-gammu-emb-common \ 15 sub-gammu-emb-common \
16 sub-gammu-emb-gammu \ 16 sub-gammu-emb-gammu \
17 sub-libical \ 17 sub-libical \
18 sub-libkcal \ 18 sub-libkcal \
@@ -85,28 +85,28 @@ sub-kaddressbook: kaddressbook/$(MAKEFILE) FORCE
85kabc/plugins/file/$(MAKEFILE): 85kabc/plugins/file/$(MAKEFILE):
86 @$(CHK_DIR_EXISTS) "kabc/plugins/file" || $(MKDIR) "kabc/plugins/file" 86 @$(CHK_DIR_EXISTS) "kabc/plugins/file" || $(MKDIR) "kabc/plugins/file"
87 cd kabc/plugins/file && $(QMAKE) file.pro -o $(MAKEFILE) 87 cd kabc/plugins/file && $(QMAKE) file.pro -o $(MAKEFILE)
88sub-kabc-plugins-file: kabc/plugins/file/$(MAKEFILE) FORCE 88sub-kabc-plugins-file: kabc/plugins/file/$(MAKEFILE) FORCE
89 cd kabc/plugins/file && $(MAKE) -f $(MAKEFILE) 89 cd kabc/plugins/file && $(MAKE) -f $(MAKEFILE)
90 90
91kabc/plugins/dir/$(MAKEFILE): 91kabc/plugins/dir/$(MAKEFILE):
92 @$(CHK_DIR_EXISTS) "kabc/plugins/dir" || $(MKDIR) "kabc/plugins/dir" 92 @$(CHK_DIR_EXISTS) "kabc/plugins/dir" || $(MKDIR) "kabc/plugins/dir"
93 cd kabc/plugins/dir && $(QMAKE) dir.pro -o $(MAKEFILE) 93 cd kabc/plugins/dir && $(QMAKE) dir.pro -o $(MAKEFILE)
94sub-kabc-plugins-dir: kabc/plugins/dir/$(MAKEFILE) FORCE 94sub-kabc-plugins-dir: kabc/plugins/dir/$(MAKEFILE) FORCE
95 cd kabc/plugins/dir && $(MAKE) -f $(MAKEFILE) 95 cd kabc/plugins/dir && $(MAKE) -f $(MAKEFILE)
96 96
97Makefile: kopi-desktop.pro /usr/lib/qt3/mkspecs/default/qmake.conf 97Makefile: kdepim-desktop.pro /usr/lib/qt3/mkspecs/default/qmake.conf
98 $(QMAKE) -o Makefile kopi-desktop.pro 98 $(QMAKE) -o Makefile kdepim-desktop.pro
99qmake: qmake_all 99qmake: qmake_all
100 @$(QMAKE) -o Makefile kopi-desktop.pro 100 @$(QMAKE) -o Makefile kdepim-desktop.pro
101 101
102all: $(SUBTARGETS) 102all: $(SUBTARGETS)
103qmake_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) 103qmake_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)
104 ( [ -d gammu/emb/common ] && cd gammu/emb/common ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true 104 ( [ -d gammu/emb/common ] && cd gammu/emb/common ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
105 ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true 105 ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
106 ( [ -d libical ] && cd libical ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true 106 ( [ -d libical ] && cd libical ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
107 ( [ -d libkcal ] && cd libkcal ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true 107 ( [ -d libkcal ] && cd libkcal ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
108 ( [ -d microkde ] && cd microkde ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true 108 ( [ -d microkde ] && cd microkde ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
109 ( [ -d libkdepim ] && cd libkdepim ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true 109 ( [ -d libkdepim ] && cd libkdepim ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
110 ( [ -d kabc ] && cd kabc ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true 110 ( [ -d kabc ] && cd kabc ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
111 ( [ -d korganizer ] && cd korganizer ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true 111 ( [ -d korganizer ] && cd korganizer ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
112 ( [ -d kaddressbook ] && cd kaddressbook ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true 112 ( [ -d kaddressbook ] && cd kaddressbook ; 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
@@ -164,22 +164,23 @@ phone/nokia/dct3/n9210.c \
164phone/nokia/dct3/dct3func.c \ 164phone/nokia/dct3/dct3func.c \
165phone/nokia/dct4/n3320.c \ 165phone/nokia/dct4/n3320.c \
166phone/nokia/dct4/n3650.c \ 166phone/nokia/dct4/n3650.c \
167phone/nokia/dct4/n6510.c \ 167phone/nokia/dct4/n6510.c \
168phone/nokia/dct4/dct4func.c \ 168phone/nokia/dct4/dct4func.c \
169phone/nokia/nauto.c \ 169phone/nokia/nauto.c \
170phone/nokia/nfunc.c \ 170phone/nokia/nfunc.c \
171phone/nokia/nfuncold.c \ 171phone/nokia/nfuncold.c \
172phone/obex/obexgen.c \ 172phone/obex/obexgen.c \
173phone/symbian/mroutgen.c 173phone/symbian/mroutgen.c
174 174
175TARGET = microgammu 175TARGET = microgammu
176CONFIG += console
176DESTDIR = ../../../bin 177DESTDIR = ../../../bin
177OBJECTS_DIR = obj/unix 178OBJECTS_DIR = obj/unix
178MOC_DIR = moc/unix 179MOC_DIR = moc/unix
179 180
180unix: { 181unix: {
181SOURCES += device/serial/ser_unx.c 182SOURCES += device/serial/ser_unx.c
182} 183}
183win32:{ 184win32:{
184SOURCES += device/serial/ser_w32.c 185SOURCES += device/serial/ser_w32.c
185} 186}
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,17 +1,18 @@
1###################################################################### 1######################################################################
2# Automatically generated by qmake (1.07a) Fri Jul 30 22:22:02 2004 2# Automatically generated by qmake (1.07a) Fri Jul 30 22:22:02 2004
3###################################################################### 3######################################################################
4 4
5TEMPLATE = app 5TEMPLATE = app
6CONFIG += console
6DEPENDPATH += msvc06.mak \ 7DEPENDPATH += msvc06.mak \
7 msvc2003.mak \ 8 msvc2003.mak \
8 smsd \ 9 smsd \
9 depend/nokia \ 10 depend/nokia \
10 depend/siemens \ 11 depend/siemens \
11 depend/nokia/dct3trac 12 depend/nokia/dct3trac
12INCLUDEPATH += . smsd depend/nokia depend/nokia/dct3trac depend/siemens 13INCLUDEPATH += . smsd depend/nokia depend/nokia/dct3trac depend/siemens
13 CONFIG = qt warn_off release 14 CONFIG = qt warn_off release
14# Input 15# Input
15 16
16HEADERS += gammu.h \ 17HEADERS += gammu.h \
17 sniff.h \ 18 sniff.h \