author | zautrix <zautrix> | 2004-08-30 11:04:01 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-08-30 11:04:01 (UTC) |
commit | 59adbf716a965d01c24b475685368681447d0b36 (patch) (unidiff) | |
tree | b8f50f8f0915e5fbffd967e9c3a0381744e2f044 | |
parent | d78908896f19bb9e63a69bf475bf417b2599653b (diff) | |
download | kdepimpi-59adbf716a965d01c24b475685368681447d0b36.zip kdepimpi-59adbf716a965d01c24b475685368681447d0b36.tar.gz kdepimpi-59adbf716a965d01c24b475685368681447d0b36.tar.bz2 |
Compile fixes
-rw-r--r-- | Makefile | 14 | ||||
-rw-r--r-- | gammu/emb/common/common.pro | 1 | ||||
-rw-r--r-- | gammu/emb/gammu/gammu.pro | 1 |
3 files changed, 9 insertions, 7 deletions
@@ -1,12 +1,12 @@ | |||
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 |
11 | DEL_FILE = rm -f | 11 | DEL_FILE = rm -f |
12 | CHK_DIR_EXISTS= test -d | 12 | CHK_DIR_EXISTS= test -d |
@@ -91,16 +91,16 @@ sub-kabc-plugins-file: kabc/plugins/file/$(MAKEFILE) FORCE | |||
91 | kabc/plugins/dir/$(MAKEFILE): | 91 | kabc/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) |
94 | sub-kabc-plugins-dir: kabc/plugins/dir/$(MAKEFILE) FORCE | 94 | sub-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 | ||
97 | Makefile: kopi-desktop.pro /usr/lib/qt3/mkspecs/default/qmake.conf | 97 | Makefile: kdepim-desktop.pro /usr/lib/qt3/mkspecs/default/qmake.conf |
98 | $(QMAKE) -o Makefile kopi-desktop.pro | 98 | $(QMAKE) -o Makefile kdepim-desktop.pro |
99 | qmake: qmake_all | 99 | qmake: qmake_all |
100 | @$(QMAKE) -o Makefile kopi-desktop.pro | 100 | @$(QMAKE) -o Makefile kdepim-desktop.pro |
101 | 101 | ||
102 | all: $(SUBTARGETS) | 102 | all: $(SUBTARGETS) |
103 | 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) | 103 | 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) |
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 |
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 | |||
@@ -170,12 +170,13 @@ phone/nokia/nauto.c \ | |||
170 | phone/nokia/nfunc.c \ | 170 | phone/nokia/nfunc.c \ |
171 | phone/nokia/nfuncold.c \ | 171 | phone/nokia/nfuncold.c \ |
172 | phone/obex/obexgen.c \ | 172 | phone/obex/obexgen.c \ |
173 | phone/symbian/mroutgen.c | 173 | phone/symbian/mroutgen.c |
174 | 174 | ||
175 | TARGET = microgammu | 175 | TARGET = microgammu |
176 | CONFIG += console | ||
176 | DESTDIR = ../../../bin | 177 | DESTDIR = ../../../bin |
177 | OBJECTS_DIR = obj/unix | 178 | OBJECTS_DIR = obj/unix |
178 | MOC_DIR = moc/unix | 179 | MOC_DIR = moc/unix |
179 | 180 | ||
180 | unix: { | 181 | unix: { |
181 | SOURCES += device/serial/ser_unx.c | 182 | SOURCES += device/serial/ser_unx.c |
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,11 +1,12 @@ | |||
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 | ||
5 | TEMPLATE = app | 5 | TEMPLATE = app |
6 | CONFIG += console | ||
6 | DEPENDPATH += msvc06.mak \ | 7 | DEPENDPATH += 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 |