CPP=g++\r
STRIP=strip\r
-CPPFLAGS=`xml2-config --cflags` `wx-config --cxxflags --libs` `curl-config --libs` -lmagic -lsfml-audio -lxml2 -std=c++11 @DBGOUT@\r
+CPPFLAGS=`xml2-config --cflags` `wx-config --cxxflags` -std=c++11 @DBGOUT@\r
+CPPLIBS=`wx-config --libs` `curl-config --libs` -lsfml-audio -lxml2\r
+MAKE=make\r
\r
@DBGSTATUS@\r
XAB_OUT=xestiaab\r
BMCO_HELP=tools/bitmapcode.helper\r
BMCO_DIR=../bitmaps\r
\r
-MAINOBJS=main.o\r
+MAINOBJS=main.o convert.o\r
CEOBJS=contacteditor/frmContactEditor.o \\r
+ contacteditor/frmContactEditor-Business.o \\r
+ contacteditor/frmContactEditor-Calendar.o \\r
+ contacteditor/frmContactEditor-Category.o \\r
+ contacteditor/frmContactEditor-Events.o \\r
+ contacteditor/frmContactEditor-General.o \\r
+ contacteditor/frmContactEditor-Groups.o \\r
+ contacteditor/frmContactEditor-Home.o \\r
+ contacteditor/frmContactEditor-Init.o \\r
+ contacteditor/frmContactEditor-Key.o \\r
+ contacteditor/frmContactEditor-Logo.o \\r
+ contacteditor/frmContactEditor-Other.o \\r
+ contacteditor/frmContactEditor-Picture.o \\r
+ contacteditor/frmContactEditor-Reset.o \\r
+ contacteditor/frmContactEditor-Sound.o \\r
contacteditor/frmContactEditor-Load.o \\r
+ contacteditor/frmContactEditor-Save.o \\r
contacteditor/frmContactEditorNickname.o \\r
contacteditor/frmContactEditorAddress.o \\r
contacteditor/frmContactEditorEmail.o \\r
contacteditor/frmContactEditorKey.o \\r
contacteditor/frmContactEditorVendor.o \\r
contacteditor/frmContactEditorXToken.o\r
-CARDDAVOBJS=carddav/carddav.o\r
+CDOOBJS=contacteditor/cdo/ContactDataObject.o\r
+CARDDAVOBJS=carddav/carddav.o carddav/carddav-connect.o \\r
+ carddav/carddav-contactlist.o carddav/carddav-defaultadrurl.o \\r
+ carddav/carddav-processdata.o carddav/carddav-servercontact.o \\r
+ carddav/carddav-serveretag.o carddav/carddav-sslverify.o\r
COMMONOBJS=common/base64.o common/preferences.o common/getcontactinfo.o \\r
common/etag.o common/textprocessing.o common/timers.o common/events.o \\r
common/filename.o common/defaults.o common/uuid.o common/svrblist.o \\r
IMEXOBJS=import/import.o import/import-vcard3.o import/import-vcard4.o \\r
import/frmImportContacts.o import/frmImportResults.o \\r
export/export.o export/export-vcard3.o export/export-vcard4.o\r
-SEARCHOBJS=search/XABSearchPanel.o search/frmSearchAccounts.o frmSearch.o\r
-VCARDOBJS=vcard/vcard.o vcard/vcard34conv.o\r
-FORMOBJS=AppXestiaAddrBk.o frmActivityMgr.o frmAbout.o frmMain.o \\r
+SEARCHOBJS=search/XABSearchPanel.o search/frmSearchAccounts.o search/frmSearch.o \\r
+ search/frmSearch-result.o search/frmSearch-contact.o \\r
+ search/frmSearch-process.o\r
+VCARDOBJS=vcard/vcard.o vcard/vcard34conv.o vcard/vcard34conv-v3conv.o \\r
+ vcard/vcard34conv-v4conv.o\r
+ACTMGROBJS=actmgr/frmActivityMgr.o actmgr/frmActivityMgr-tasks.o\r
+FORMOBJS=AppXestiaAddrBk.o frmAbout.o frmMain.o \\r
frmNewAccount.o frmPreferences.o frmContact.o frmConflictResolution.o \\r
frmEditAccount.o frmInvalidSSLCertificate.o frmSSLCertificate.o \\r
frmUpdate.o\r
-WIDGETOBJS=widgets/XABAccountView.o\r
+WIDGETOBJS=widgets/XABAccountView.o widgets/XABContactMenu.o\r
BMCOOBJS=tools/bitmapcode.o\r
\r
-xestiaab: bitmaphelper formobjs widgetobjs commonobjs vcardobjs carddavobjs \\r
- ceobjs mainobjs searchobjs imexobjs \r
- $(CPP) $(CPPFLAGS) $(FORMOBJS) $(WIDGETOBJS) $(COMMONOBJS) \\r
- $(VCARDOBJS) $(CEOBJS) $(CARDDAVOBJS) $(SEARCHOBJS) $(MAINOBJS) $(IMEXOBJS) -o $(XAB_OUT)\r
+default:\r
+ $(MAKE) bitmaphelper\r
+ $(MAKE) xestiaab\r
+\r
+xestiaab: actmgrobjs formobjs widgetobjs commonobjs vcardobjs \\r
+ carddavobjs ceobjs cdoobjs mainobjs searchobjs imexobjs \r
+ $(CPP) $(CPPFLAGS) $(ACTMGROBJS) $(FORMOBJS) $(WIDGETOBJS) \\r
+ $(COMMONOBJS) $(VCARDOBJS) $(CEOBJS) $(CDOOBJS) $(CARDDAVOBJS) \\r
+ $(SEARCHOBJS) $(MAINOBJS) $(IMEXOBJS) -o $(XAB_OUT) $(CPPLIBS)\r
ifeq ($(DEBUG), false)\r
$(STRIP) -s $(XAB_OUT)\r
endif\r
\r
+actmgrobjs: $(ACTMGROBJS)\r
+\r
carddavobjs: $(CARDDAVOBJS)\r
\r
mainobjs: $(MAINOBJS)\r
\r
ceobjs: $(CEOBJS) \r
\r
+cdoobjs: $(CDOOBJS)\r
+\r
formobjs: $(FORMOBJS)\r
\r
searchobjs: $(SEARCHOBJS)\r
clean:\r
rm -f $(XAB_OUT) $(BMCO_HELP) tools/bitmapcode.o *.o \\r
vcard/*.o common/*.o carddav/*.o contacteditor/*.o search/*.o \\r
- widgets/*.o export/*.o import/*.o\r
+ widgets/*.o export/*.o import/*.o actmgr/*.o contacteditor/cdo/*.o \\r
+ tests/Temp* tests/*.o tests/$(XAB_OUT)_test\r
\r
distclean: clean\r
- rm -f Makefile config.status config.log bitmapsdone \\r
+ rm -f Makefile tests/Makefile \\r
+ config.status config.log bitmapsdone \\r
tools/bitmapcode.helper bitmaps.h\r
find bitmaps -name "*.cpp" -type f -delete\r
find bitmaps -name "*.h" -type f -delete\r
+ chmod 644 tests/InvalidPermissions.vcf\r
\r
bitmaphelperobjs: $(BMCOOBJS)\r
\r
bitmaphelper: bitmaphelperobjs\r
- $(CPP) $(CPPFLAGS) $(BMCOOBJS) -o $(BMCO_HELP)\r
+ $(CPP) $(CPPFLAGS) $(BMCOOBJS) -o $(BMCO_HELP) $(CPPLIBS)\r
$(BMCO_HELP) bitmaps/\r
\r
install:\r
uninstall:\r
rm @BINDIR@/$(XAB_OUT)\r
\r
-docs:\r
- @SOFFICEOUT@\r
+test:\r
+ @echo "To build and run the unit tests, run 'make' from the tests directory."\r