X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=blobdiff_plain;f=source%2FMakefile.in;h=2f0063c18fb56abb09603d73b4cc31e190380b82;hp=ea4e3b1ae1ba6fd08f4e0d3eee480f5bf2f33e7d;hb=f69e09d827e06435ea94bb73aa71ab5f9d5c035b;hpb=5e0d4aba3979404f08a3f864fffb61889d057278

diff --git a/source/Makefile.in b/source/Makefile.in
index ea4e3b1..2f0063c 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -2,6 +2,8 @@ CPP=g++
 STRIP=strip
 CPPFLAGS=`xml2-config --cflags` `wx-config --cxxflags` -std=c++11 @DBGOUT@
 CPPLIBS=`wx-config --libs` `curl-config --libs` -lsfml-audio -lxml2
+MAKE=make
+MKDIR=mkdir
 
 @DBGSTATUS@
 XAB_OUT=xestiaab
@@ -9,7 +11,10 @@ XAB_OUT=xestiaab
 BMCO_HELP=tools/bitmapcode.helper
 BMCO_DIR=../bitmaps
 
-MAINOBJS=main.o
+ODTHELPBROWSER_OUT=odthelpbrowser
+ODTHELPBROWSER_PATH=tools/odthelpbrowser/$(ODTHELPBROWSER_OUT)
+
+MAINOBJS=main.o convert.o
 CEOBJS=contacteditor/frmContactEditor.o \
  contacteditor/frmContactEditor-Business.o \
  contacteditor/frmContactEditor-Calendar.o \
@@ -26,30 +31,6 @@ CEOBJS=contacteditor/frmContactEditor.o \
  contacteditor/frmContactEditor-Reset.o \
  contacteditor/frmContactEditor-Sound.o \
  contacteditor/frmContactEditor-Load.o \
- contacteditor/frmContactEditor-LoadAddress.o \
- contacteditor/frmContactEditor-LoadBADays.o \
- contacteditor/frmContactEditor-LoadCategory.o \
- contacteditor/frmContactEditor-LoadCalendar.o \
- contacteditor/frmContactEditor-LoadEmail.o \
- contacteditor/frmContactEditor-LoadGender.o \
- contacteditor/frmContactEditor-LoadGeo.o \
- contacteditor/frmContactEditor-LoadGroup.o \
- contacteditor/frmContactEditor-LoadIM.o \
- contacteditor/frmContactEditor-LoadKey.o \
- contacteditor/frmContactEditor-LoadLanguage.o \
- contacteditor/frmContactEditor-LoadLogo.o \
- contacteditor/frmContactEditor-LoadName.o \
- contacteditor/frmContactEditor-LoadNickname.o \
- contacteditor/frmContactEditor-LoadNote.o \
- contacteditor/frmContactEditor-LoadOrg.o \
- contacteditor/frmContactEditor-LoadPhoto.o \
- contacteditor/frmContactEditor-LoadRelated.o \
- contacteditor/frmContactEditor-LoadRole.o \
- contacteditor/frmContactEditor-LoadSound.o \
- contacteditor/frmContactEditor-LoadTelephone.o \
- contacteditor/frmContactEditor-LoadTimeZone.o \
- contacteditor/frmContactEditor-LoadTitle.o \
- contacteditor/frmContactEditor-LoadURL.o \
  contacteditor/frmContactEditor-Save.o \
  contacteditor/frmContactEditorNickname.o \
  contacteditor/frmContactEditorAddress.o \
@@ -73,38 +54,57 @@ CEOBJS=contacteditor/frmContactEditor.o \
  contacteditor/frmContactEditorKey.o \
  contacteditor/frmContactEditorVendor.o \
  contacteditor/frmContactEditorXToken.o
-CARDDAVOBJS=carddav/carddav.o carddav/carddav-connect.o \
- carddav/carddav-contactlist.o carddav/carddav-defaultadrurl.o \
- carddav/carddav-processdata.o carddav/carddav-servercontact.o \
- carddav/carddav-serveretag.o carddav/carddav-sslverify.o
+CDOOBJS=contacteditor/cdo/ContactDataObject.o \
+ contacteditor/cdo/ContactDataObject-Save.o
+CONNOBJS=connobject/ConnectionObject.o
+CARDDAV2OBJS=carddav2/carddav2.o
 COMMONOBJS=common/base64.o common/preferences.o common/getcontactinfo.o \
  common/etag.o common/textprocessing.o common/timers.o common/events.o \
  common/filename.o common/defaults.o common/uuid.o common/svrblist.o \
- common/dirs.o common/mime.o
+ common/dirs.o common/mime.o common/languages.o
 IMEXOBJS=import/import.o import/import-vcard3.o import/import-vcard4.o \
  import/frmImportContacts.o import/frmImportResults.o \
  export/export.o export/export-vcard3.o export/export-vcard4.o
-SEARCHOBJS=search/XABSearchPanel.o search/frmSearchAccounts.o frmSearch.o
+SEARCHOBJS=search/XABSearchPanel.o search/frmSearchAccounts.o search/frmSearch.o \
+ search/frmSearch-result.o search/frmSearch-contact.o \
+ search/frmSearch-process.o
 VCARDOBJS=vcard/vcard.o vcard/vcard34conv.o vcard/vcard34conv-v3conv.o \
  vcard/vcard34conv-v4conv.o
-ACTMGROBJS=actmgr/frmActivityMgr.o
+ACTMGROBJS=actmgr/frmActivityMgr.o actmgr/frmActivityMgr-tasks.o
 FORMOBJS=AppXestiaAddrBk.o frmAbout.o frmMain.o \
- frmNewAccount.o frmPreferences.o frmContact.o frmConflictResolution.o \
- frmEditAccount.o frmInvalidSSLCertificate.o frmSSLCertificate.o \
- frmUpdate.o
-WIDGETOBJS=widgets/XABAccountView.o widgets/XABContactMenu.o
+ frmNewAccount.o frmNewAccount-CardDAV2.o frmPreferences.o frmContact.o \
+ frmConflictResolution.o frmEditAccount.o frmInvalidSSLCertificate.o \
+ frmSSLCertificate.o frmUpdate.o
+WIDGETOBJS=widgets/XABAccountView.o widgets/XABContactMenu.o \
+ widgets/XABPriorityCtrl.o
 BMCOOBJS=tools/bitmapcode.o
-
-xestiaab: bitmaphelper formobjs widgetobjs commonobjs vcardobjs carddavobjs \
-	ceobjs mainobjs searchobjs imexobjs 
-	$(CPP) $(CPPFLAGS) $(ACTMGROBJS) $(FORMOBJS) $(WIDGETOBJS) $(COMMONOBJS) \
-	$(VCARDOBJS) $(CEOBJS) $(CARDDAVOBJS) $(SEARCHOBJS) $(MAINOBJS) $(IMEXOBJS) -o $(XAB_OUT) \
-	$(CPPLIBS)
+ODTHELPBROWSEROBJS=tools/odthelpbrowser/main.o \
+ tools/odthelpbrowser/ODTHelpBrowser.o \
+ tools/odthelpbrowser/frmMain.o \
+ tools/odthelpbrowser/odt.o \
+ tools/odthelpbrowser/base64.o
+
+default:
+	$(MAKE) bitmaphelper
+	$(MAKE) odthelpbrowser
+	$(MAKE) xestiaab
+
+xestiaab: actmgrobjs formobjs widgetobjs commonobjs vcardobjs \
+	connobjs carddav2objs ceobjs cdoobjs mainobjs \
+	searchobjs imexobjs
+	$(CPP) $(CPPFLAGS) $(ACTMGROBJS) $(FORMOBJS) $(WIDGETOBJS) \
+	$(COMMONOBJS) $(VCARDOBJS) $(CEOBJS) $(CDOOBJS) \
+	$(SEARCHOBJS) $(MAINOBJS) $(IMEXOBJS) $(CONNOBJS) $(CARDDAV2OBJS) \
+	-o $(XAB_OUT) $(CPPLIBS)
 ifeq ($(DEBUG), false)
 	$(STRIP) -s $(XAB_OUT)
 endif
 
-carddavobjs: $(CARDDAVOBJS)
+actmgrobjs: $(ACTMGROBJS)
+
+carddav2objs: $(CARDDAV2OBJS)
+
+connobjs: $(CONNOBJS)
 
 mainobjs: $(MAINOBJS)
 
@@ -112,7 +112,9 @@ commonobjs: $(COMMONOBJS)
 
 vcardobjs: $(VCARDOBJS)
 
-ceobjs: $(CEOBJS)	
+ceobjs: $(CEOBJS)
+
+cdoobjs: $(CDOOBJS)
 
 formobjs: $(FORMOBJS)
 
@@ -123,15 +125,20 @@ widgetobjs: $(WIDGETOBJS)
 imexobjs: $(IMEXOBJS)
 
 clean:
-	rm -f $(XAB_OUT) $(BMCO_HELP) tools/bitmapcode.o *.o \
-	vcard/*.o common/*.o carddav/*.o contacteditor/*.o search/*.o \
-	widgets/*.o export/*.o import/*.o tests/$(XAB_OUT)_test
+	rm -f $(XAB_OUT) $(BMCO_HELP) $(ODTHELPBROWSER_PATH) \
+	tools/bitmapcode.o *.o vcard/*.o common/*.o contacteditor/*.o \
+	search/*.o widgets/*.o export/*.o import/*.o actmgr/*.o \
+	contacteditor/cdo/*.o tests/Temp* tests/*.o tests/classes/*.o \
+	connobject/*.o carddav2/*.o tools/odthelpbrowser/*.o \
+	tools/odthelpbrowser/odthelpbrowser tests/$(XAB_OUT)_test
 
 distclean: clean
-	rm -f Makefile config.status config.log bitmapsdone \
+	rm -f Makefile tests/Makefile \
+	config.status config.log bitmapsdone \
 	tools/bitmapcode.helper bitmaps.h
 	find bitmaps -name "*.cpp" -type f -delete
 	find bitmaps -name "*.h" -type f -delete
+	chmod 644 tests/InvalidPermissions.vcf
 
 bitmaphelperobjs: $(BMCOOBJS)
 
@@ -139,11 +146,28 @@ bitmaphelper: bitmaphelperobjs
 	$(CPP) $(CPPFLAGS) $(BMCOOBJS) -o $(BMCO_HELP) $(CPPLIBS)
 	$(BMCO_HELP) bitmaps/
 
-install:
+odthelpbrowserobjs: $(ODTHELPBROWSEROBJS)
+
+odthelpbrowser: odthelpbrowserobjs
+	$(CPP) $(CPPFLAGS) $(ODTHELPBROWSEROBJS) -o $(ODTHELPBROWSER_PATH) $(CPPLIBS)
+
+install-docs:
+	#TODO: Add @PREFIX@ for docs, xestiaab and man page
+	$(MKDIR) @DATAROOTDIR@/doc/xestiaab/
+	cp "../docs/Documentation (en_GB).fodt" @DATAROOTDIR@/doc/xestiaab/en_GB.fodt
+
+install: install-docs
 	cp $(XAB_OUT) @BINDIR@/$(XAB_OUT)
+	cp $(ODTHELPBROWSER_PATH) @BINDIR@/$(ODTHELPBROWSER_OUT)
+	cp xestiaab.1 @DATAROOTDIR@/man/man1/xestiaab.1
+
+uninstall-docs:
+	rm -rf @DATAROOTDIR@/doc/xestiaab
 
-uninstall:
+uninstall: uninstall-docs
 	rm @BINDIR@/$(XAB_OUT)
+	cp @BINDIR@/$(ODTHELPBROWSER_OUT)
+	rm @DATAROOTDIR@/man/man1/xestiaab.1
 
 test:
-	@GTEST@
+	@echo "To build and run the unit tests, run 'make' from the tests directory."