Moved frmActivityMgr.{cpp,h} into the ACTMGROBJS section.

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

diff --git a/source/Makefile.in b/source/Makefile.in
index a2b25c7..ea4e3b1 100644 (file)
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -87,16 +87,17 @@ IMEXOBJS=import/import.o import/import-vcard3.o import/import-vcard4.o \
 SEARCHOBJS=search/XABSearchPanel.o search/frmSearchAccounts.o frmSearch.o\r
 VCARDOBJS=vcard/vcard.o vcard/vcard34conv.o vcard/vcard34conv-v3conv.o \\r
  vcard/vcard34conv-v4conv.o\r
-FORMOBJS=AppXestiaAddrBk.o frmActivityMgr.o frmAbout.o frmMain.o \\r
+ACTMGROBJS=actmgr/frmActivityMgr.o\r
+FORMOBJS=AppXestiaAddrBk.o frmAbout.o frmMain.o \\r
  frmNewAccount.o frmPreferences.o frmContact.o frmConflictResolution.o \\r
  frmEditAccount.o frmInvalidSSLCertificate.o frmSSLCertificate.o \\r
  frmUpdate.o\r
-WIDGETOBJS=widgets/XABAccountView.o\r
+WIDGETOBJS=widgets/XABAccountView.o widgets/XABContactMenu.o\r
 BMCOOBJS=tools/bitmapcode.o\r
 \r
 xestiaab: bitmaphelper formobjs widgetobjs commonobjs vcardobjs carddavobjs \\r
        ceobjs mainobjs searchobjs imexobjs \r
-       $(CPP) $(CPPFLAGS) $(FORMOBJS) $(WIDGETOBJS) $(COMMONOBJS) \\r
+       $(CPP) $(CPPFLAGS) $(ACTMGROBJS) $(FORMOBJS) $(WIDGETOBJS) $(COMMONOBJS) \\r
        $(VCARDOBJS) $(CEOBJS) $(CARDDAVOBJS) $(SEARCHOBJS) $(MAINOBJS) $(IMEXOBJS) -o $(XAB_OUT) \\r
        $(CPPLIBS)\r
 ifeq ($(DEBUG), false)\r
@@ -124,7 +125,7 @@ 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\r
+       widgets/*.o export/*.o import/*.o tests/$(XAB_OUT)_test\r
 \r
 distclean: clean\r
        rm -f Makefile config.status config.log bitmapsdone \\r
@@ -144,5 +145,5 @@ install:
 uninstall:\r
        rm @BINDIR@/$(XAB_OUT)\r
 \r
-docs:\r
-       @SOFFICEOUT@\r
+test:\r
+       @GTEST@\r