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
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
+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\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
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
+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
$(STRIP) -s $(XAB_OUT)\r
endif\r
\r
+actmgrobjs: $(ACTMGROBJS)\r
+\r
carddavobjs: $(CARDDAVOBJS)\r
\r
mainobjs: $(MAINOBJS)\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 tests/$(XAB_OUT)_test\r
+ widgets/*.o export/*.o import/*.o actmgr/*.o tests/$(XAB_OUT)_test \\r
+ tests/Temp*\r
\r
distclean: clean\r
rm -f Makefile 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
+@GTEST@\r