Added the contacteditor/cdo directory when doing a 'clean' or 'distclean'.

[xestiaab/.git] / source / Makefile.in

diff --git a/source/Makefile.in b/source/Makefile.in
index da178fc..26ace7a 100644 (file)
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -9,7 +9,7 @@ XAB_OUT=xestiaab
 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
@@ -26,30 +26,6 @@ CEOBJS=contacteditor/frmContactEditor.o \
  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
@@ -73,6 +49,7 @@ CEOBJS=contacteditor/frmContactEditor.o \
  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
@@ -98,10 +75,10 @@ WIDGETOBJS=widgets/XABAccountView.o widgets/XABContactMenu.o
 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
+       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
@@ -118,6 +95,8 @@ vcardobjs: $(VCARDOBJS)
 \r
 ceobjs: $(CEOBJS)      \r
 \r
+cdoobjs: $(CDOOBJS)\r
+\r
 formobjs: $(FORMOBJS)\r
 \r
 searchobjs: $(SEARCHOBJS)\r
@@ -129,13 +108,15 @@ imexobjs: $(IMEXOBJS)
 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 tests/$(XAB_OUT)_test \\r
+       tests/Temp* contacteditor/cdo/*.o\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
@@ -150,4 +131,4 @@ uninstall:
        rm @BINDIR@/$(XAB_OUT)\r
 \r
 test:\r
-       @GTEST@\r
+@GTEST@\r