X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2FMakefile.in;h=38c0de3a887f33ceada7509cdea127fe96c7178c;hb=16c32f9a916d348dedb2f02c481633a04838a808;hp=d41ad2cf9b4480c450509270ddb9e80eb14fedc3;hpb=51f26bf112c65ec493cdb2646ba69d81a2428e61;p=xestiaab%2F.git diff --git a/source/Makefile.in b/source/Makefile.in index d41ad2c..38c0de3 100644 --- a/source/Makefile.in +++ b/source/Makefile.in @@ -52,6 +52,8 @@ CEOBJS=contacteditor/frmContactEditor.o \ contacteditor/frmContactEditorXToken.o CDOOBJS=contacteditor/cdo/ContactDataObject.o \ contacteditor/cdo/ContactDataObject-Save.o +CONNOBJS=connobject/ConnectionObject.o +CARDDAV2OBJS=carddav2/carddav2.o CARDDAVOBJS=carddav/carddav.o carddav/carddav-connect.o \ carddav/carddav-contactlist.o carddav/carddav-defaultadrurl.o \ carddav/carddav-processdata.o carddav/carddav-servercontact.o \ @@ -70,9 +72,9 @@ VCARDOBJS=vcard/vcard.o vcard/vcard34conv.o vcard/vcard34conv-v3conv.o \ vcard/vcard34conv-v4conv.o ACTMGROBJS=actmgr/frmActivityMgr.o actmgr/frmActivityMgr-tasks.o FORMOBJS=AppXestiaAddrBk.o frmAbout.o frmMain.o \ - frmNewAccount.o frmPreferences.o frmContact.o frmConflictResolution.o \ - frmEditAccount.o frmInvalidSSLCertificate.o frmSSLCertificate.o \ - frmUpdate.o + frmNewAccount.o frmNewAccount-CardDAV2.o frmPreferences.o frmContact.o \ + frmConflictResolution.o frmEditAccount.o frmInvalidSSLCertificate.o \ + frmSSLCertificate.o frmUpdate.o WIDGETOBJS=widgets/XABAccountView.o widgets/XABContactMenu.o BMCOOBJS=tools/bitmapcode.o @@ -81,10 +83,12 @@ default: $(MAKE) xestiaab xestiaab: actmgrobjs formobjs widgetobjs commonobjs vcardobjs \ - carddavobjs ceobjs cdoobjs mainobjs searchobjs imexobjs + connobjs carddavobjs carddav2objs ceobjs cdoobjs mainobjs \ + searchobjs imexobjs $(CPP) $(CPPFLAGS) $(ACTMGROBJS) $(FORMOBJS) $(WIDGETOBJS) \ $(COMMONOBJS) $(VCARDOBJS) $(CEOBJS) $(CDOOBJS) $(CARDDAVOBJS) \ - $(SEARCHOBJS) $(MAINOBJS) $(IMEXOBJS) -o $(XAB_OUT) $(CPPLIBS) + $(SEARCHOBJS) $(MAINOBJS) $(IMEXOBJS) $(CONNOBJS) $(CARDDAV2OBJS) \ + -o $(XAB_OUT) $(CPPLIBS) ifeq ($(DEBUG), false) $(STRIP) -s $(XAB_OUT) endif @@ -93,6 +97,10 @@ actmgrobjs: $(ACTMGROBJS) carddavobjs: $(CARDDAVOBJS) +carddav2objs: $(CARDDAV2OBJS) + +connobjs: $(CONNOBJS) + mainobjs: $(MAINOBJS) commonobjs: $(COMMONOBJS)