fix #3284: support lib/MULTIARCH/ paths in installation, use GNUNET_PREFIX=@libdir...

[oweals/gnunet.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index d8d3fbf572bb4a677e84d7beb011c046e78fae39..08693ec026cebf859923c6442af13bec66531f73 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,21 +6,30 @@ if HAVE_TESTING
  TESTING = testing
  TESTBED = testbed
  CONSENSUS = consensus
+# SECRETSHARING = secretsharing
  EXPERIMENTATION = experimentation
 endif
 
 if HAVE_EXPERIMENTAL
- EXP_DIR = dv $(CONSENSUS) $(EXPERIMENTATION) 
+ EXP_DIR = \
+  dv \
+  scalarproduct \
+  multicast \
+  env \
+  psycstore \
+  psyc \
+  $(CONSENSUS) \
+  $(SECRETSHARING) \
+  $(EXPERIMENTATION)
 endif
 
-if LINUX
-# All of these currently only work on GNU/Linux or W32
- LINUX_DIR = exit vpn
-# pt # without namestore, pt currently has some issues...
+
+if BUILD_PULSE_HELPERS
+CONVERSATION_DIR = conversation
+else
+if BUILD_GST_HELPERS
+CONVERSATION_DIR = conversation
 endif
-if MINGW
- MINGW_DIR = vpn exit 
-# pt # without namestore, pt currently has some issues...
 endif
 
 if HAVE_MYSQL
@@ -31,7 +40,6 @@ if HAVE_POSTGRES
  POSTGRES_DIR = postgres
 endif
 
-
 SUBDIRS = \
   include $(INTLEMU_SUBDIRS) \
   util \
@@ -55,20 +63,25 @@ SUBDIRS = \
   peerinfo-tool \
   core \
   $(TESTBED) \
+  ats-tests \
   nse \
   dht \
   hostlist \
   topology \
   regex \
   mesh \
-  lockmanager \
   dns \
   identity \
   set \
+  revocation \
+  gnsrecord \
+  namecache \
+  namestore \
+  vpn \
+  gns \
+  $(CONVERSATION_DIR) \
   fs \
-  $(LINUX_DIR) \
-  $(MINGW_DIR) \
+  exit \
+  pt \
   integration-tests \
-  $(EXP_DIR) 
-
-# note: namestore, gns are not listed right now as they are being reworked to use the new crypto
\ No newline at end of file
+  $(EXP_DIR)