[pisa-src] r1352 - in trunk: community-operator/Makefile.am pairing/Makefile.am pisacd/Makefile.am pisasd/Makefile.am
- From: Diego Biurrun <diego@xxxxxxxxxx>
- To: pisa-src@xxxxxxxxxxxxx
- Date: Tue, 27 Oct 2009 17:03:19 +0100
Author: biurrun
Date: Tue Oct 27 17:03:19 2009
New Revision: 1352
Log:
Fix header installation during 'make dist' and 'make install'.
include_HEADERS is just for headers that should be installed on the target
system during 'make install', i.e. library headers to be placed in a location
similar to /usr/include. Random headers that should just be part of the
distribution need to be added to EXTRA_DIST.
Modified:
trunk/community-operator/Makefile.am
trunk/pairing/Makefile.am
trunk/pisacd/Makefile.am
trunk/pisasd/Makefile.am
Modified: trunk/community-operator/Makefile.am
==============================================================================
--- trunk/community-operator/Makefile.am Tue Oct 27 16:59:13 2009
(r1351)
+++ trunk/community-operator/Makefile.am Tue Oct 27 17:03:19 2009
(r1352)
@@ -34,4 +34,4 @@
co_client_SOURCES = co_client.c pisa_cert.c
co_server_SOURCES = co_server.c hipl.c
-include_HEADERS = hipl.h co_common_packets.h
+EXTRA_DIST = *.h
Modified: trunk/pairing/Makefile.am
==============================================================================
--- trunk/pairing/Makefile.am Tue Oct 27 16:59:13 2009 (r1351)
+++ trunk/pairing/Makefile.am Tue Oct 27 17:03:19 2009 (r1352)
@@ -7,11 +7,7 @@
accept_CFLAGS = -DACCEPT
bin_PROGRAMS = send accept passgen management
-include_HEADERS = common_headers.h send.h common.h packet_handler.h hash.h
libconfig_wrapper.h packet_handler_send.h create_send_headers.h
-include_HEADERS += hash.h accept.h common_headers.h packet_handler.h
libconfig_wrapper.h common.h packet_handler_accept.h create_accept_headers.h
-include_HEADERS += hash.h management.h
-
-EXTRA_DIST = readme.txt \
+EXTRA_DIST = readme.txt *.h \
defaults/authorized_hosts.cfg defaults/known_relays.cfg
defaults/relay_config.cfg \
defaults/sha.txt defaults/user_config.cfg
Modified: trunk/pisacd/Makefile.am
==============================================================================
--- trunk/pisacd/Makefile.am Tue Oct 27 16:59:13 2009 (r1351)
+++ trunk/pisacd/Makefile.am Tue Oct 27 17:03:19 2009 (r1352)
@@ -6,7 +6,7 @@
bin_PROGRAMS = pisacdconf
sbin_PROGRAMS = pisacd
-EXTRA_DIST = pisacd.conf
+EXTRA_DIST = pisacd.conf *.h
sysconf_DATA = pisacd.conf
if PISA_FORCE_SHLIB
@@ -23,6 +23,3 @@
cdheartbeat.c cdpending.c cdregister.c cdservers.c \
cdtimeout.c cdtun.c pisacdconf.c cdconfhandlers.c
pisacdconf_SOURCES = pisaconftool.c pisacdconf.c
-include_HEADERS = cdconf.h cdconfhandlers.h cdctx.h cdderegister.h \
- cdheartbeat.h cdpending.h cdregister.h cdservers.h \
- cdtimeout.h cdtun.h pisacdconf.h cdconfhandlers.h
Modified: trunk/pisasd/Makefile.am
==============================================================================
--- trunk/pisasd/Makefile.am Tue Oct 27 16:59:13 2009 (r1351)
+++ trunk/pisasd/Makefile.am Tue Oct 27 17:03:19 2009 (r1352)
@@ -6,7 +6,7 @@
bin_PROGRAMS = pisasdconf
sbin_PROGRAMS = pisasd
-EXTRA_DIST = pisasd.conf authorized_hosts.conf users.conf
+EXTRA_DIST = pisasd.conf authorized_hosts.conf users.conf *.h
sysconf_DATA = pisasd.conf authorized_hosts.conf users.conf
if PISA_FORCE_SHLIB
@@ -23,5 +23,3 @@
sdheartbeat.c sdregister.c sdtun.c pisasdconf.c \
sdnat.c
pisasdconf_SOURCES = pisaconftool.c pisasdconf.c
-include_HEADERS = sdclients.h sdconf.h sdctx.h sdderegister.h sdheartbeat.h \
- sdregister.h sdtun.h pisasdconf.h sdnat.h
Other related posts:
- » [pisa-src] r1352 - in trunk: community-operator/Makefile.am pairing/Makefile.am pisacd/Makefile.am pisasd/Makefile.am - Diego Biurrun
