X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2FMakefile.in;h=fe89db5923981f3f52c035d8e21e7b7255aee2ba;hb=a45c3a46e4e37da415a8b8da2aaabe6a4abc4551;hp=7edf2e021fd8bb94cf1f38cd877ce0c3f943882e;hpb=9d0a5f05554b6f20ccd44f147c6214d974059137;p=xestiaab%2F.git

diff --git a/source/Makefile.in b/source/Makefile.in
index 7edf2e0..fe89db5 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -1,6 +1,7 @@
 CPP=g++
 STRIP=strip
-CPPFLAGS=`xml2-config --cflags` `wx-config --cxxflags --libs` `curl-config --libs` -lmagic -lsfml-audio -lxml2 -std=c++11 @DBGOUT@
+CPPFLAGS=`xml2-config --cflags` `wx-config --cxxflags` -std=c++11 @DBGOUT@
+CPPLIBS=`wx-config --libs` `curl-config --libs` -lsfml-audio -lxml2
 
 @DBGSTATUS@
 XAB_OUT=xestiaab
@@ -8,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 \
@@ -83,24 +84,30 @@ COMMONOBJS=common/base64.o common/preferences.o common/getcontactinfo.o \
 IMEXOBJS=import/import.o import/import-vcard3.o import/import-vcard4.o \
  import/frmImportContacts.o import/frmImportResults.o \
  export/export.o export/export-vcard3.o export/export-vcard4.o
-SEARCHOBJS=search/XABSearchPanel.o search/frmSearchAccounts.o frmSearch.o
+SEARCHOBJS=search/XABSearchPanel.o search/frmSearchAccounts.o search/frmSearch.o \
+ search/frmSearch-result.o search/frmSearch-contact.o \
+ search/frmSearch-process.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 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
-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) \
-	$(VCARDOBJS) $(CEOBJS) $(CARDDAVOBJS) $(SEARCHOBJS) $(MAINOBJS) $(IMEXOBJS) -o $(XAB_OUT)
+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)
 ifeq ($(DEBUG), false)
 	$(STRIP) -s $(XAB_OUT)
 endif
 
+actmgrobjs: $(ACTMGROBJS)
+
 carddavobjs: $(CARDDAVOBJS)
 
 mainobjs: $(MAINOBJS)
@@ -122,18 +129,20 @@ 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 actmgr/*.o tests/$(XAB_OUT)_test \
+	tests/Temp*
 
 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)
 
 bitmaphelper: bitmaphelperobjs
-	$(CPP) $(CPPFLAGS) $(BMCOOBJS) -o $(BMCO_HELP)
+	$(CPP) $(CPPFLAGS) $(BMCOOBJS) -o $(BMCO_HELP) $(CPPLIBS)
 	$(BMCO_HELP) bitmaps/
 
 install:
@@ -142,5 +151,5 @@ install:
 uninstall:
 	rm @BINDIR@/$(XAB_OUT)
 
-docs:
-	@SOFFICEOUT@
+test:
+@GTEST@