Moved the unit testing compilation into a separate Makefile

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

diff --git a/source/Makefile.in b/source/Makefile.in
index 26ace7a..9ec3eb4 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
+MAKE=make\r
 \r
 @DBGSTATUS@\r
 XAB_OUT=xestiaab\r
@@ -74,7 +75,11 @@ FORMOBJS=AppXestiaAddrBk.o frmAbout.o frmMain.o \
 WIDGETOBJS=widgets/XABAccountView.o widgets/XABContactMenu.o\r
 BMCOOBJS=tools/bitmapcode.o\r
 \r
-xestiaab: bitmaphelper actmgrobjs formobjs widgetobjs commonobjs vcardobjs \\r
+default:\r
+       $(MAKE) bitmaphelper\r
+       $(MAKE) xestiaab\r
+\r
+xestiaab: actmgrobjs formobjs widgetobjs commonobjs vcardobjs \\r
        carddavobjs ceobjs cdoobjs mainobjs searchobjs imexobjs \r
        $(CPP) $(CPPFLAGS) $(ACTMGROBJS) $(FORMOBJS) $(WIDGETOBJS) \\r
        $(COMMONOBJS) $(VCARDOBJS) $(CEOBJS) $(CDOOBJS) $(CARDDAVOBJS) \\r
@@ -108,11 +113,12 @@ 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
-       tests/Temp* contacteditor/cdo/*.o\r
+       widgets/*.o export/*.o import/*.o actmgr/*.o contacteditor/cdo/*.o \\r
+       tests/Temp* tests/*.o tests/$(XAB_OUT)_test\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
@@ -131,4 +137,4 @@ uninstall:
        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