contacteditor/frmContactEditorKey.o \\r
contacteditor/frmContactEditorVendor.o \\r
contacteditor/frmContactEditorXToken.o\r
-CDOOBJS=contacteditor/cdo/ContactDataObject.o\r
+CDOOBJS=contacteditor/cdo/ContactDataObject.o \\r
+ contacteditor/cdo/ContactDataObject-Save.o\r
+CONNOBJS=connobject/ConnectionObject.o\r
+CARDDAV2OBJS=carddav2/carddav2.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
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
+ frmNewAccount.o frmNewAccount-CardDAV2.o frmPreferences.o frmContact.o \\r
+ frmConflictResolution.o frmEditAccount.o frmInvalidSSLCertificate.o \\r
+ frmSSLCertificate.o frmUpdate.o\r
WIDGETOBJS=widgets/XABAccountView.o widgets/XABContactMenu.o\r
BMCOOBJS=tools/bitmapcode.o\r
\r
$(MAKE) xestiaab\r
\r
xestiaab: actmgrobjs formobjs widgetobjs commonobjs vcardobjs \\r
- carddavobjs ceobjs cdoobjs mainobjs searchobjs imexobjs \r
+ connobjs carddavobjs carddav2objs ceobjs cdoobjs mainobjs \\r
+ searchobjs imexobjs \r
$(CPP) $(CPPFLAGS) $(ACTMGROBJS) $(FORMOBJS) $(WIDGETOBJS) \\r
$(COMMONOBJS) $(VCARDOBJS) $(CEOBJS) $(CDOOBJS) $(CARDDAVOBJS) \\r
- $(SEARCHOBJS) $(MAINOBJS) $(IMEXOBJS) -o $(XAB_OUT) $(CPPLIBS)\r
+ $(SEARCHOBJS) $(MAINOBJS) $(IMEXOBJS) $(CONNOBJS) $(CARDDAV2OBJS) \\r
+ -o $(XAB_OUT) $(CPPLIBS)\r
ifeq ($(DEBUG), false)\r
$(STRIP) -s $(XAB_OUT)\r
endif\r
\r
carddavobjs: $(CARDDAVOBJS)\r
\r
+carddav2objs: $(CARDDAV2OBJS)\r
+\r
+connobjs: $(CONNOBJS)\r
+\r
mainobjs: $(MAINOBJS)\r
\r
commonobjs: $(COMMONOBJS)\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 actmgr/*.o tests/$(XAB_OUT)_test \\r
- tests/Temp* contacteditor/cdo/*.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
rm @BINDIR@/$(XAB_OUT)\r
\r
test:\r
-@GTEST@\r
+ @echo "To build and run the unit tests, run 'make' from the tests directory."\r