X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2FMakefile.in;h=d41ad2cf9b4480c450509270ddb9e80eb14fedc3;hb=aed4d9705523e0367229674cff1a2b7bdd8318c7;hp=f60c988ccd34c2cd511bd79f3bae2f7f3efeb987;hpb=23776c47694a72b7ae42c3c0f63bd24ab63a3bad;p=xestiaab%2F.git

diff --git a/source/Makefile.in b/source/Makefile.in
index f60c988..d41ad2c 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -2,6 +2,7 @@ CPP=g++
 STRIP=strip
 CPPFLAGS=`xml2-config --cflags` `wx-config --cxxflags` -std=c++11 @DBGOUT@
 CPPLIBS=`wx-config --libs` `curl-config --libs` -lsfml-audio -lxml2
+MAKE=make
 
 @DBGSTATUS@
 XAB_OUT=xestiaab
@@ -49,7 +50,8 @@ CEOBJS=contacteditor/frmContactEditor.o \
  contacteditor/frmContactEditorKey.o \
  contacteditor/frmContactEditorVendor.o \
  contacteditor/frmContactEditorXToken.o
-CDOOBJS=contacteditor/cdo/ContactDataObject.o
+CDOOBJS=contacteditor/cdo/ContactDataObject.o \
+ contacteditor/cdo/ContactDataObject-Save.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 \
@@ -74,7 +76,11 @@ FORMOBJS=AppXestiaAddrBk.o frmAbout.o frmMain.o \
 WIDGETOBJS=widgets/XABAccountView.o widgets/XABContactMenu.o
 BMCOOBJS=tools/bitmapcode.o
 
-xestiaab: bitmaphelper actmgrobjs formobjs widgetobjs commonobjs vcardobjs \
+default:
+	$(MAKE) bitmaphelper
+	$(MAKE) xestiaab
+
+xestiaab: actmgrobjs formobjs widgetobjs commonobjs vcardobjs \
 	carddavobjs ceobjs cdoobjs mainobjs searchobjs imexobjs 
 	$(CPP) $(CPPFLAGS) $(ACTMGROBJS) $(FORMOBJS) $(WIDGETOBJS) \
 	$(COMMONOBJS) $(VCARDOBJS) $(CEOBJS) $(CDOOBJS) $(CARDDAVOBJS) \
@@ -108,11 +114,12 @@ 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 \
-	tests/Temp*
+	widgets/*.o export/*.o import/*.o actmgr/*.o contacteditor/cdo/*.o \
+	tests/Temp* tests/*.o tests/$(XAB_OUT)_test
 
 distclean: clean
-	rm -f Makefile config.status config.log bitmapsdone \
+	rm -f Makefile tests/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
@@ -131,4 +138,4 @@ uninstall:
 	rm @BINDIR@/$(XAB_OUT)
 
 test:
-@GTEST@
+	@echo "To build and run the unit tests, run 'make' from the tests directory."