r22111 - gnucash/trunk/src - Fix r22105 that was missing some dependency of the "optional" directory on other parts.

Christian Stimming cstim at code.gnucash.org
Fri Mar 23 16:52:14 EDT 2012


Author: cstim
Date: 2012-03-23 16:52:13 -0400 (Fri, 23 Mar 2012)
New Revision: 22111
Trac: http://svn.gnucash.org/trac/changeset/22111

Modified:
   gnucash/trunk/src/Makefile.am
Log:
Fix r22105 that was missing some dependency of the "optional" directory on other parts.

Modified: gnucash/trunk/src/Makefile.am
===================================================================
--- gnucash/trunk/src/Makefile.am	2012-03-22 09:11:47 UTC (rev 22110)
+++ gnucash/trunk/src/Makefile.am	2012-03-23 20:52:13 UTC (rev 22111)
@@ -13,16 +13,15 @@
   quotes \
   tax
 
-# These directories should also not contain any gtk dependencies, but
-# currently there is only single very little dependency in
-# app-utils. It should go away in the long run, though.
 if WITH_PYTHON
    PYTHON_DIR = python
 endif
 
+# These directories should also not contain any gtk dependencies, but
+# currently there is only single very little dependency in
+# app-utils. It should go away in the long run, though.
 ALMOST_NONGUI_SUBDIRS = \
   app-utils \
-  optional \
   ${PYTHON_DIR}
 
 # These directories contain the code with gtk dependency
@@ -35,6 +34,7 @@
   gnome \
   import-export \
   business \
+  optional \
   plugins \
   bin
 
@@ -42,7 +42,10 @@
 if GNUCASH_ENABLE_GUI
 SUBDIRS = . $(NONGUI_SUBDIRS) $(ALMOST_NONGUI_SUBDIRS) $(GUI_SUBDIRS)
 else
-SUBDIRS = . $(NONGUI_SUBDIRS) $(ALMOST_NONGUI_SUBDIRS)
+# Note: In non-GUI build, "optional" needs to be added as well, but
+# cannot be added in the variable because in with-GUI mode it depends
+# on other parts.
+SUBDIRS = . $(NONGUI_SUBDIRS) $(ALMOST_NONGUI_SUBDIRS) optional
 endif
 
 noinst_HEADERS = \



More information about the gnucash-changes mailing list