[hipl-commit] [tiny] Rev 3687: Added module_info.xml-files to EXTRA_DIST and revert "-"-prefix.

  • From: Tim Just <tim.just@xxxxxxxxxxxxxx>
  • To: hipl-commit@xxxxxxxxxxxxx
  • Date: Tue, 16 Mar 2010 19:13:22 +0200

Committer: Tim Just <tim.just@xxxxxxxxxxxxxx>
Date: 16/03/2010 at 19:13:22
Revision: 3687
Revision-id: tim.just@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: tiny

Log:
  Added module_info.xml-files to EXTRA_DIST and revert "-"-prefix.
  
  The xml files are needed during the configure run and therefore should be
  included in EXTRA_DIST.
  
  The "-"-prefix caused strange errors during linking.

Modified:
  M  Makefile.am
  M  autogen.sh

=== modified file 'Makefile.am'
--- Makefile.am 2010-03-16 13:58:39 +0000
+++ Makefile.am 2010-03-16 17:11:17 +0000
@@ -7,7 +7,7 @@
 # XX FIX: use dist_doc_DATA for all documentation (if you change this,
 # make sure the check the "make bin" still works)
 #
-EXTRA_DIST =  debian doc lib/android patches
+EXTRA_DIST =  debian doc lib/android patches $(wildcard 
modules/*/module_info.xml)
 EXTRA_DIST += test/packaging test/configs process_modules.py project_info.xml
 EXTRA_DIST += Android.mk autogen.sh check_header_verbosity.sh
 EXTRA_DIST += release.version tcp verbose-headers.txt
@@ -282,7 +282,7 @@
 
 endif # HIP_FIREWALL
 
--include Makefile.modules
+include Makefile.modules
 
 CLEANFILES = tools/hipdnsproxy tools/hipdnskeyparse
 

=== modified file 'autogen.sh'
--- autogen.sh  2010-03-16 13:58:39 +0000
+++ autogen.sh  2010-03-16 17:11:17 +0000
@@ -80,6 +80,9 @@
     exit
 fi
 
+# Create empty file needed by automake.
+touch Makefile.modules
+
 display_pre_info
 
 setup_hipl && display_post_info

Other related posts:

  • » [hipl-commit] [tiny] Rev 3687: Added module_info.xml-files to EXTRA_DIST and revert "-"-prefix. - Tim Just