X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2FMakefile.in;h=26ace7a051490142330b78b114aab30a4745ca7b;hb=a3b107eb177d062c2ea7f2eca5e6e8c3c1e3a8d9;hp=da178fc1372baf41a3a6c2354b14172f318d13cd;hpb=4ea07d6964c0f73c858e83513e14a28000054256;p=xestiaab%2F.git

diff --git a/source/Makefile.in b/source/Makefile.in
index da178fc..26ace7a 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -9,7 +9,7 @@ XAB_OUT=xestiaab
 BMCO_HELP=tools/bitmapcode.helper
 BMCO_DIR=../bitmaps
 
-MAINOBJS=main.o
+MAINOBJS=main.o convert.o
 CEOBJS=contacteditor/frmContactEditor.o \
  contacteditor/frmContactEditor-Business.o \
  contacteditor/frmContactEditor-Calendar.o \
@@ -26,30 +26,6 @@ CEOBJS=contacteditor/frmContactEditor.o \
  contacteditor/frmContactEditor-Reset.o \
  contacteditor/frmContactEditor-Sound.o \
  contacteditor/frmContactEditor-Load.o \
- contacteditor/frmContactEditor-LoadAddress.o \
- contacteditor/frmContactEditor-LoadBADays.o \
- contacteditor/frmContactEditor-LoadCategory.o \
- contacteditor/frmContactEditor-LoadCalendar.o \
- contacteditor/frmContactEditor-LoadEmail.o \
- contacteditor/frmContactEditor-LoadGender.o \
- contacteditor/frmContactEditor-LoadGeo.o \
- contacteditor/frmContactEditor-LoadGroup.o \
- contacteditor/frmContactEditor-LoadIM.o \
- contacteditor/frmContactEditor-LoadKey.o \
- contacteditor/frmContactEditor-LoadLanguage.o \
- contacteditor/frmContactEditor-LoadLogo.o \
- contacteditor/frmContactEditor-LoadName.o \
- contacteditor/frmContactEditor-LoadNickname.o \
- contacteditor/frmContactEditor-LoadNote.o \
- contacteditor/frmContactEditor-LoadOrg.o \
- contacteditor/frmContactEditor-LoadPhoto.o \
- contacteditor/frmContactEditor-LoadRelated.o \
- contacteditor/frmContactEditor-LoadRole.o \
- contacteditor/frmContactEditor-LoadSound.o \
- contacteditor/frmContactEditor-LoadTelephone.o \
- contacteditor/frmContactEditor-LoadTimeZone.o \
- contacteditor/frmContactEditor-LoadTitle.o \
- contacteditor/frmContactEditor-LoadURL.o \
  contacteditor/frmContactEditor-Save.o \
  contacteditor/frmContactEditorNickname.o \
  contacteditor/frmContactEditorAddress.o \
@@ -73,6 +49,7 @@ CEOBJS=contacteditor/frmContactEditor.o \
  contacteditor/frmContactEditorKey.o \
  contacteditor/frmContactEditorVendor.o \
  contacteditor/frmContactEditorXToken.o
+CDOOBJS=contacteditor/cdo/ContactDataObject.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 \
@@ -98,10 +75,10 @@ WIDGETOBJS=widgets/XABAccountView.o widgets/XABContactMenu.o
 BMCOOBJS=tools/bitmapcode.o
 
 xestiaab: bitmaphelper actmgrobjs formobjs widgetobjs commonobjs vcardobjs \
-	carddavobjs ceobjs mainobjs searchobjs imexobjs 
-	$(CPP) $(CPPFLAGS) $(ACTMGROBJS) $(FORMOBJS) $(WIDGETOBJS) $(COMMONOBJS) \
-	$(VCARDOBJS) $(CEOBJS) $(CARDDAVOBJS) $(SEARCHOBJS) $(MAINOBJS) $(IMEXOBJS) -o $(XAB_OUT) \
-	$(CPPLIBS)
+	carddavobjs ceobjs cdoobjs mainobjs searchobjs imexobjs 
+	$(CPP) $(CPPFLAGS) $(ACTMGROBJS) $(FORMOBJS) $(WIDGETOBJS) \
+	$(COMMONOBJS) $(VCARDOBJS) $(CEOBJS) $(CDOOBJS) $(CARDDAVOBJS) \
+	$(SEARCHOBJS) $(MAINOBJS) $(IMEXOBJS) -o $(XAB_OUT) $(CPPLIBS)
 ifeq ($(DEBUG), false)
 	$(STRIP) -s $(XAB_OUT)
 endif
@@ -118,6 +95,8 @@ vcardobjs: $(VCARDOBJS)
 
 ceobjs: $(CEOBJS)	
 
+cdoobjs: $(CDOOBJS)
+
 formobjs: $(FORMOBJS)
 
 searchobjs: $(SEARCHOBJS)
@@ -129,13 +108,15 @@ 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 actmgr/*.o tests/$(XAB_OUT)_test
+	widgets/*.o export/*.o import/*.o actmgr/*.o tests/$(XAB_OUT)_test \
+	tests/Temp* contacteditor/cdo/*.o
 
 distclean: clean
 	rm -f Makefile config.status config.log bitmapsdone \
 	tools/bitmapcode.helper bitmaps.h
 	find bitmaps -name "*.cpp" -type f -delete
 	find bitmaps -name "*.h" -type f -delete
+	chmod 644 tests/InvalidPermissions.vcf
 
 bitmaphelperobjs: $(BMCOOBJS)
 
@@ -150,4 +131,4 @@ uninstall:
 	rm @BINDIR@/$(XAB_OUT)
 
 test:
-	@GTEST@
+@GTEST@