[hipl-commit] [tiny] Rev 3686: Fixed out-of-source build and make distcheck.

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

Committer: Tim Just <tim.just@xxxxxxxxxxxxxx>
Date: 16/03/2010 at 16:02:50
Revision: 3686
Revision-id: tim.just@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: tiny

Log:
  Fixed out-of-source build and make distcheck.
  
  Now, out-of-source builds and make distcheck are working.
  
  Added project_info.xml to EXTRA_DIST and the generated header files and
  Makefile.modules to the DISTCLEANFILES list.
  
  Removed creation of emtpy Makefile.modules in autogen.sh. Instead add
  '-' prefix to the include statement. This causes automake to ignore, if
  the file not exists.

Modified:
  M  Makefile.am
  M  autogen.sh

=== modified file 'Makefile.am'
--- Makefile.am 2010-03-11 17:04:35 +0000
+++ Makefile.am 2010-03-16 13:58:39 +0000
@@ -8,7 +8,7 @@
 # make sure the check the "make bin" still works)
 #
 EXTRA_DIST =  debian doc lib/android patches
-EXTRA_DIST += test/packaging test/configs process_modules.py
+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
 EXTRA_DIST += tools/gen-python-starter.sh
@@ -199,7 +199,7 @@
 #lib_ipsec_la_LIBADD = $(LEXLIB)
 
 #DISTCLEANFILES = policy_parse.c policy_token.c policy_token.h
-DISTCLEANFILES = lib/ipsec/policy_token.h
+DISTCLEANFILES = lib/ipsec/policy_token.h Makefile.modules $(wildcard 
modules/*.h)
 
 # don't use libipsec, but xfrmapi
 if !HIP_PFKEY
@@ -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-10 17:48:17 +0000
+++ autogen.sh  2010-03-16 13:58:39 +0000
@@ -80,9 +80,6 @@
     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 3686: Fixed out-of-source build and make distcheck. - Tim Just