X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2FMakefile.in;h=ea4e3b1ae1ba6fd08f4e0d3eee480f5bf2f33e7d;hb=5e0d4aba3979404f08a3f864fffb61889d057278;hp=7601f1fd2f709ff1d0722e33027bbce7489427a2;hpb=f465aa76237915dfa58983da02e2ea0707ef0d07;p=xestiaab%2F.git diff --git a/source/Makefile.in b/source/Makefile.in index 7601f1f..ea4e3b1 100644 --- a/source/Makefile.in +++ b/source/Makefile.in @@ -87,16 +87,17 @@ IMEXOBJS=import/import.o import/import-vcard3.o import/import-vcard4.o \ SEARCHOBJS=search/XABSearchPanel.o search/frmSearchAccounts.o frmSearch.o VCARDOBJS=vcard/vcard.o vcard/vcard34conv.o vcard/vcard34conv-v3conv.o \ vcard/vcard34conv-v4conv.o -FORMOBJS=AppXestiaAddrBk.o frmActivityMgr.o frmAbout.o frmMain.o \ +ACTMGROBJS=actmgr/frmActivityMgr.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 +WIDGETOBJS=widgets/XABAccountView.o widgets/XABContactMenu.o BMCOOBJS=tools/bitmapcode.o xestiaab: bitmaphelper formobjs widgetobjs commonobjs vcardobjs carddavobjs \ ceobjs mainobjs searchobjs imexobjs - $(CPP) $(CPPFLAGS) $(FORMOBJS) $(WIDGETOBJS) $(COMMONOBJS) \ + $(CPP) $(CPPFLAGS) $(ACTMGROBJS) $(FORMOBJS) $(WIDGETOBJS) $(COMMONOBJS) \ $(VCARDOBJS) $(CEOBJS) $(CARDDAVOBJS) $(SEARCHOBJS) $(MAINOBJS) $(IMEXOBJS) -o $(XAB_OUT) \ $(CPPLIBS) ifeq ($(DEBUG), false) @@ -124,7 +125,7 @@ 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 + widgets/*.o export/*.o import/*.o tests/$(XAB_OUT)_test distclean: clean rm -f Makefile config.status config.log bitmapsdone \ @@ -143,3 +144,6 @@ install: uninstall: rm @BINDIR@/$(XAB_OUT) + +test: + @GTEST@