STRIP=strip\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-Reset.o \\r
contacteditor/frmContactEditor-Sound.o \\r
contacteditor/frmContactEditor-Load.o \\r
- contacteditor/frmContactEditor-LoadAddress.o \\r
- contacteditor/frmContactEditor-LoadBADays.o \\r
- contacteditor/frmContactEditor-LoadCategory.o \\r
- contacteditor/frmContactEditor-LoadCalendar.o \\r
- contacteditor/frmContactEditor-LoadEmail.o \\r
- contacteditor/frmContactEditor-LoadGender.o \\r
- contacteditor/frmContactEditor-LoadGeo.o \\r
- contacteditor/frmContactEditor-LoadGroup.o \\r
- contacteditor/frmContactEditor-LoadIM.o \\r
- contacteditor/frmContactEditor-LoadKey.o \\r
- contacteditor/frmContactEditor-LoadLanguage.o \\r
- contacteditor/frmContactEditor-LoadLogo.o \\r
- contacteditor/frmContactEditor-LoadName.o \\r
- contacteditor/frmContactEditor-LoadNickname.o \\r
- contacteditor/frmContactEditor-LoadNote.o \\r
- contacteditor/frmContactEditor-LoadOrg.o \\r
- contacteditor/frmContactEditor-LoadPhoto.o \\r
- contacteditor/frmContactEditor-LoadRelated.o \\r
- contacteditor/frmContactEditor-LoadRole.o \\r
- contacteditor/frmContactEditor-LoadSound.o \\r
- contacteditor/frmContactEditor-LoadTelephone.o \\r
- contacteditor/frmContactEditor-LoadTimeZone.o \\r
- contacteditor/frmContactEditor-LoadTitle.o \\r
- contacteditor/frmContactEditor-LoadURL.o \\r
contacteditor/frmContactEditor-Save.o \\r
contacteditor/frmContactEditorNickname.o \\r
contacteditor/frmContactEditorAddress.o \\r
contacteditor/frmContactEditorKey.o \\r
contacteditor/frmContactEditorVendor.o \\r
contacteditor/frmContactEditorXToken.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
WIDGETOBJS=widgets/XABAccountView.o widgets/XABContactMenu.o\r
BMCOOBJS=tools/bitmapcode.o\r
\r
-xestiaab: bitmaphelper actmgrobjs formobjs widgetobjs commonobjs vcardobjs \\r
- carddavobjs ceobjs mainobjs searchobjs imexobjs \r
- $(CPP) $(CPPFLAGS) $(ACTMGROBJS) $(FORMOBJS) $(WIDGETOBJS) $(COMMONOBJS) \\r
- $(VCARDOBJS) $(CEOBJS) $(CARDDAVOBJS) $(SEARCHOBJS) $(MAINOBJS) $(IMEXOBJS) -o $(XAB_OUT) \\r
- $(CPPLIBS)\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
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 actmgr/*.o tests/$(XAB_OUT)_test\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
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