Not Logged In
|
Login
|
Register
Home
|
News
|
Projects
|
Releases
Bugs
|
RFE
|
Repositories
|
Help
projects
/
xestiaab
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed CardDAV class and all uses/references.
[xestiaab/.git]
/
source
/
Makefile.in
diff --git
a/source/Makefile.in
b/source/Makefile.in
index
f60c988
..
dae6590
100644
(file)
--- a/
source/Makefile.in
+++ b/
source/Makefile.in
@@
-2,6
+2,7
@@
CPP=g++
STRIP=strip
\r
CPPFLAGS=`xml2-config --cflags` `wx-config --cxxflags` -std=c++11 @DBGOUT@
\r
CPPLIBS=`wx-config --libs` `curl-config --libs` -lsfml-audio -lxml2
\r
STRIP=strip
\r
CPPFLAGS=`xml2-config --cflags` `wx-config --cxxflags` -std=c++11 @DBGOUT@
\r
CPPLIBS=`wx-config --libs` `curl-config --libs` -lsfml-audio -lxml2
\r
+MAKE=make
\r
\r
@DBGSTATUS@
\r
XAB_OUT=xestiaab
\r
\r
@DBGSTATUS@
\r
XAB_OUT=xestiaab
\r
@@
-49,7
+50,10
@@
CEOBJS=contacteditor/frmContactEditor.o \
contacteditor/frmContactEditorKey.o \
\r
contacteditor/frmContactEditorVendor.o \
\r
contacteditor/frmContactEditorXToken.o
\r
contacteditor/frmContactEditorKey.o \
\r
contacteditor/frmContactEditorVendor.o \
\r
contacteditor/frmContactEditorXToken.o
\r
-CDOOBJS=contacteditor/cdo/ContactDataObject.o
\r
+CDOOBJS=contacteditor/cdo/ContactDataObject.o \
\r
+ contacteditor/cdo/ContactDataObject-Save.o
\r
+CONNOBJS=connobject/ConnectionObject.o
\r
+CARDDAV2OBJS=carddav2/carddav2.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
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
@@
-68,17
+72,23
@@
VCARDOBJS=vcard/vcard.o vcard/vcard34conv.o vcard/vcard34conv-v3conv.o \
vcard/vcard34conv-v4conv.o
\r
ACTMGROBJS=actmgr/frmActivityMgr.o actmgr/frmActivityMgr-tasks.o
\r
FORMOBJS=AppXestiaAddrBk.o frmAbout.o frmMain.o \
\r
vcard/vcard34conv-v4conv.o
\r
ACTMGROBJS=actmgr/frmActivityMgr.o actmgr/frmActivityMgr-tasks.o
\r
FORMOBJS=AppXestiaAddrBk.o frmAbout.o frmMain.o \
\r
- frmNewAccount.o frm
Preferences.o frmContact.o frmConflictResolution
.o \
\r
- frm
EditAccount.o frmInvalidSSLCertificate.o frm
SSLCertificate.o \
\r
- frmUpdate.o
\r
+ frmNewAccount.o frm
NewAccount-CardDAV2.o frmPreferences.o frmContact
.o \
\r
+ frm
ConflictResolution.o frmEditAccount.o frmInvalid
SSLCertificate.o \
\r
+ frm
SSLCertificate.o frm
Update.o
\r
WIDGETOBJS=widgets/XABAccountView.o widgets/XABContactMenu.o
\r
BMCOOBJS=tools/bitmapcode.o
\r
\r
WIDGETOBJS=widgets/XABAccountView.o widgets/XABContactMenu.o
\r
BMCOOBJS=tools/bitmapcode.o
\r
\r
-xestiaab: bitmaphelper actmgrobjs formobjs widgetobjs commonobjs vcardobjs \
\r
- carddavobjs ceobjs cdoobjs mainobjs searchobjs imexobjs
\r
+default:
\r
+ $(MAKE) bitmaphelper
\r
+ $(MAKE) xestiaab
\r
+
\r
+xestiaab: actmgrobjs formobjs widgetobjs commonobjs vcardobjs \
\r
+ connobjs carddavobjs carddav2objs ceobjs cdoobjs mainobjs \
\r
+ searchobjs imexobjs
\r
$(CPP) $(CPPFLAGS) $(ACTMGROBJS) $(FORMOBJS) $(WIDGETOBJS) \
\r
$(COMMONOBJS) $(VCARDOBJS) $(CEOBJS) $(CDOOBJS) $(CARDDAVOBJS) \
\r
$(CPP) $(CPPFLAGS) $(ACTMGROBJS) $(FORMOBJS) $(WIDGETOBJS) \
\r
$(COMMONOBJS) $(VCARDOBJS) $(CEOBJS) $(CDOOBJS) $(CARDDAVOBJS) \
\r
- $(SEARCHOBJS) $(MAINOBJS) $(IMEXOBJS) -o $(XAB_OUT) $(CPPLIBS)
\r
+ $(SEARCHOBJS) $(MAINOBJS) $(IMEXOBJS) $(CONNOBJS) $(CARDDAV2OBJS) \
\r
+ -o $(XAB_OUT) $(CPPLIBS)
\r
ifeq ($(DEBUG), false)
\r
$(STRIP) -s $(XAB_OUT)
\r
endif
\r
ifeq ($(DEBUG), false)
\r
$(STRIP) -s $(XAB_OUT)
\r
endif
\r
@@
-87,6
+97,10
@@
actmgrobjs: $(ACTMGROBJS)
\r
carddavobjs: $(CARDDAVOBJS)
\r
\r
\r
carddavobjs: $(CARDDAVOBJS)
\r
\r
+carddav2objs: $(CARDDAV2OBJS)
\r
+
\r
+connobjs: $(CONNOBJS)
\r
+
\r
mainobjs: $(MAINOBJS)
\r
\r
commonobjs: $(COMMONOBJS)
\r
mainobjs: $(MAINOBJS)
\r
\r
commonobjs: $(COMMONOBJS)
\r
@@
-108,11
+122,13
@@
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
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
- tests/Temp*
\r
+ widgets/*.o export/*.o import/*.o actmgr/*.o contacteditor/cdo/*.o \
\r
+ tests/Temp* tests/*.o tests/classes/*.o connobject/*.o \
\r
+ carddav2/*.o tests/$(XAB_OUT)_test
\r
\r
distclean: clean
\r
\r
distclean: clean
\r
- rm -f Makefile config.status config.log bitmapsdone \
\r
+ rm -f Makefile tests/Makefile \
\r
+ 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
tools/bitmapcode.helper bitmaps.h
\r
find bitmaps -name "*.cpp" -type f -delete
\r
find bitmaps -name "*.h" -type f -delete
\r
@@
-131,4
+147,4
@@
uninstall:
rm @BINDIR@/$(XAB_OUT)
\r
\r
test:
\r
rm @BINDIR@/$(XAB_OUT)
\r
\r
test:
\r
-@GTEST@
\r
+ @echo "To build and run the unit tests, run 'make' from the tests directory."
\r
Yn Maystri
© 2006 - 2019 Xestia Software Development
Software
Xestia Address Book
Xestia Calendar
Development
Xestia Gelforn
Everything else
About
News
Privacy Policy