| -rw-r--r-- | Makefile | 24 | ||||
| -rw-r--r-- | pwmanager/pwmanager/pwmanagerE.pro | 11 | ||||
| -rw-r--r-- | pwmanager/pwmanager/pwmdoc.cpp | 2 |
3 files changed, 33 insertions, 4 deletions
@@ -49,2 +49,6 @@ SUBDIRS_GAMMU = \ SUBDIRS_PWMANAGER = \ + pwmanager/libcrypt/mpi \ + pwmanager/libcrypt/error \ + pwmanager/libcrypt/cipher \ + pwmanager/libcrypt/zlib \ pwmanager/pwmanager @@ -206,2 +210,3 @@ objects: mkdir -p libical/lib/$(PLATFORM) + mkdir -p pwmanager/libcrypt/$(PLATFORM) @@ -209,2 +214,3 @@ clean: rm -rf libical/lib/$(PLATFORM)/*; + rm -rf pwmanager/libcrypt/$(PLATFORM)/*; for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\ @@ -267,2 +273,6 @@ tmake: objects \ pwmanager/pwmanager/Makefile$(PLATFORM) \ + pwmanager/libcrypt/mpi/Makefile$(PLATFORM) \ + pwmanager/libcrypt/error/Makefile$(PLATFORM) \ + pwmanager/libcrypt/cipher/Makefile$(PLATFORM) \ + pwmanager/libcrypt/zlib/Makefile$(PLATFORM) @@ -338 +348,15 @@ pwmanager/pwmanager/Makefile$(PLATFORM): pwmanager/pwmanager/pwmanagerE.pro + +pwmanager/libcrypt/mpi/Makefile$(PLATFORM): pwmanager/libcrypt/mpi/mpi.pro + cd pwmanager/libcrypt/mpi;tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" mpi.pro -o Makefile$(PLATFORM) + +pwmanager/libcrypt/error/Makefile$(PLATFORM): pwmanager/libcrypt/error/error.pro + cd pwmanager/libcrypt/error;tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" error.pro -o Makefile$(PLATFORM) + +pwmanager/libcrypt/cipher/Makefile$(PLATFORM): pwmanager/libcrypt/cipher/cipher.pro + cd pwmanager/libcrypt/cipher;tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" cipher.pro -o Makefile$(PLATFORM) + +pwmanager/libcrypt/zlib/Makefile$(PLATFORM): pwmanager/libcrypt/zlib/zlib.pro + cd pwmanager/libcrypt/zlib;tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" zlib.pro -o Makefile$(PLATFORM) + + diff --git a/pwmanager/pwmanager/pwmanagerE.pro b/pwmanager/pwmanager/pwmanagerE.pro index 4c3a568..6aa0571 100644 --- a/pwmanager/pwmanager/pwmanagerE.pro +++ b/pwmanager/pwmanager/pwmanagerE.pro @@ -14,3 +14,3 @@ DEFINES += PWM_EMBEDDED CONFIG_PWMANAGER_GCRY #DEFINES += CONFIG_DEBUG - +LIBS += -L../libcrypt/$(PLATFORM) LIBS += -lmicrokde @@ -20,6 +20,11 @@ LIBS += -L$(QPEDIR)/lib LIBS += -lqpe -LIBS += -lz +LIBS += -lzlib #LIBS += -lbz2 -LIBS += -lgcrypt +#LIBS += -lkpmicrogcrypt +LIBS += -ljpeg LIBS += $(QTOPIALIB) +LIBS += -lkpmicrocipher +LIBS += -lkpmicroerror +LIBS += -lkpmicrompi +LIBS += -lstdc++ diff --git a/pwmanager/pwmanager/pwmdoc.cpp b/pwmanager/pwmanager/pwmdoc.cpp index f4a1636..e29e3d1 100644 --- a/pwmanager/pwmanager/pwmdoc.cpp +++ b/pwmanager/pwmanager/pwmdoc.cpp @@ -348,3 +348,3 @@ PwMerror PwMDoc::saveDoc(char compress, const QString *file) ret = e_success; - goto out; + return ret; } |