Committer: Diego Biurrun <diego@xxxxxxxxxx> Date: 07/04/2010 at 16:05:52 Revision: 4146 Revision-id: diego@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx Branch nick: trunk Log: whitespace cosmetics: alphabetical order, prettyprinting Modified: M Makefile.am === modified file 'Makefile.am' --- Makefile.am 2010-04-07 11:49:57 +0000 +++ Makefile.am 2010-04-07 13:05:35 +0000 @@ -30,17 +30,17 @@ dist_images_DATA = lib/gui/hipmanager.png ### bin_PROGRAMS ### -bin_PROGRAMS = test/conntest-client-opp \ +bin_PROGRAMS = test/auth_performance \ + test/certteststub \ + test/conntest-client-opp \ test/conntest-client-hip \ - test/conntest-server \ - test/cookietest \ - test/keygentest \ - test/hashtest \ - test/listtest \ - test/certteststub \ - test/sqliteteststub \ - test/hc_performance \ - test/auth_performance + test/conntest-server \ + test/cookietest \ + test/hashtest \ + test/hc_performance \ + test/keygentest \ + test/listtest \ + test/sqliteteststub if HIP_DHT bin_PROGRAMS += test/dhtteststub @@ -51,8 +51,8 @@ endif ### sbin_PROGRAMS ### -sbin_PROGRAMS = hipd/hipd \ - tools/hipconf \ +sbin_PROGRAMS = hipd/hipd \ + tools/hipconf \ tools/pisacert if HIP_FIREWALL @@ -88,15 +88,15 @@ endif if HIP_I3 -noinst_LIBRARIES = i3/aeshash/libaes.a \ - i3/chord/libchord.a \ - i3/i3/libi3.a \ +noinst_LIBRARIES = i3/aeshash/libaes.a \ + i3/chord/libchord.a \ + i3/i3/libi3.a \ i3/i3_client/libi3client.a \ i3/utils/libutils.a -noinst_PROGRAMS = i3/chord/gen_conf \ - i3/chord/gen_conf_same \ - i3/chord/test \ +noinst_PROGRAMS = i3/chord/gen_conf \ + i3/chord/gen_conf_same \ + i3/chord/test \ i3/chord/chord_getfingers \ i3/chord/chord_traceroute endif # HIP_I3 @@ -111,65 +111,55 @@ test_conntest_server_SOURCES = test/conntest-server.c \ test/conntest.c - -test_cookietest_SOURCES = test/cookietest.c - -test_keygentest_SOURCES = test/keygentest.c - -test_hashtest_SOURCES = test/hashtest.c - -test_listtest_SOURCES = test/listtest.c - -test_dhtteststub_SOURCES = test/dhtteststub.c - -test_certteststub_SOURCES = test/certteststub.c - -test_sqliteteststub_SOURCES = test/sqliteteststub.c - -test_hc_performance_SOURCES = test/hc_performance.c - test_auth_performance_SOURCES = test/auth_performance.c - -test_dh_performance_SOURCES = test/dh_performance.c - -tools_hipconf_SOURCES = tools/hipconftool.c - +test_certteststub_SOURCES = test/certteststub.c +test_cookietest_SOURCES = test/cookietest.c +test_dh_performance_SOURCES = test/dh_performance.c +test_dhtteststub_SOURCES = test/dhtteststub.c +test_hashtest_SOURCES = test/hashtest.c +test_hc_performance_SOURCES = test/hc_performance.c +test_keygentest_SOURCES = test/keygentest.c +test_listtest_SOURCES = test/listtest.c +test_sqliteteststub_SOURCES = test/sqliteteststub.c + +tools_hipconf_SOURCES = tools/hipconftool.c tools_pisacert_SOURCES = tools/pisacert.c -hipd_hipd_SOURCES = hipd/update.c \ - hipd/hipd.c \ - hipd/keymat.c \ - hipd/blind.c \ - hipd/hiprelay.c \ - hipd/registration.c \ - hipd/user.c \ - hipd/hadb.c \ - hipd/close.c \ - hipd/configfilereader.c \ - hipd/input.c \ - hipd/output.c \ - hipd/hidb.c \ - hipd/cookie.c \ - hipd/netdev.c \ - hipd/bos.c \ - hipd/nat.c \ - hipd/init.c \ - hipd/maintenance.c \ - hipd/accessor.c \ - hipd/oppipdb.c \ - hipd/dh.c \ - hipd/cert.c \ - hipd/user_ipsec_sadb_api.c \ - hipd/user_ipsec_hipd_msg.c \ - hipd/esp_prot_hipd_msg.c \ - hipd/esp_prot_anchordb.c \ - hipd/dhtqueue.c \ +hipd_hipd_SOURCES = hipd/accessor.c \ + hipd/blind.c \ + hipd/bos.c \ + hipd/cert.c \ + hipd/close.c \ + hipd/configfilereader.c \ + hipd/cookie.c \ + hipd/dh.c \ + hipd/dhtqueue.c \ + hipd/esp_prot_anchordb.c \ + hipd/esp_prot_hipd_msg.c \ hipd/esp_prot_light_update.c \ - hipd/nsupdate.c \ - hipd/hit_to_ip.c \ - hipd/update_legacy.c \ - hipd/hadb_legacy.c \ - hipd/heartbeat.c + hipd/hadb.c \ + hipd/hadb_legacy.c \ + hipd/heartbeat.c \ + hipd/hidb.c \ + hipd/hipd.c \ + hipd/hiprelay.c \ + hipd/hit_to_ip.c \ + hipd/init.c \ + hipd/input.c \ + hipd/keymat.c \ + hipd/maintenance.c \ + hipd/nat.c \ + hipd/netdev.c \ + hipd/nsupdate.c \ + hipd/oppipdb.c \ + hipd/output.c \ + hipd/registration.c \ + hipd/update.c \ + hipd/update_legacy.c \ + hipd/user.c \ + hipd/user_ipsec_hipd_msg.c \ + hipd/user_ipsec_sadb_api.c + if HIP_I3 hipd_hipd_SOURCES += hipd/hi3.c endif @@ -190,94 +180,94 @@ hipd_hipd_SOURCES += hipd/oppdb.c endif -firewall_hipfw_SOURCES = firewall/firewall.c \ - firewall/conntrack.c \ - firewall/rule_management.c \ - firewall/helpers.c \ - firewall/firewall_control.c \ - firewall/proxydb.c \ - firewall/proxyconndb.c \ - firewall/dlist.c \ - firewall/hslist.c \ - firewall/user_ipsec_api.c \ - firewall/user_ipsec_sadb.c \ - firewall/user_ipsec_fw_msg.c \ - firewall/common_hipd_msg.c \ - firewall/esp_prot_api.c \ - firewall/esp_prot_fw_msg.c \ - firewall/esp_prot_conntrack.c \ - firewall/esp_prot_config.c \ - firewall/proxy.c \ - firewall/opptcp.c \ - firewall/firewalldb.c \ - firewall/lsi.c \ - firewall/sysopp.c \ - firewall/cache.c \ - firewall/cache_port.c \ - firewall/datapkt.c \ - firewall/user_ipsec_esp.c +firewall_hipfw_SOURCES = firewall/cache.c \ + firewall/cache_port.c \ + firewall/common_hipd_msg.c \ + firewall/conntrack.c \ + firewall/datapkt.c \ + firewall/dlist.c \ + firewall/esp_prot_api.c \ + firewall/esp_prot_config.c \ + firewall/esp_prot_conntrack.c \ + firewall/esp_prot_fw_msg.c \ + firewall/firewall.c \ + firewall/firewall_control.c \ + firewall/firewalldb.c \ + firewall/helpers.c \ + firewall/hslist.c \ + firewall/lsi.c \ + firewall/opptcp.c \ + firewall/proxy.c \ + firewall/proxyconndb.c \ + firewall/proxydb.c \ + firewall/rule_management.c \ + firewall/sysopp.c \ + firewall/user_ipsec_api.c \ + firewall/user_ipsec_esp.c \ + firewall/user_ipsec_fw_msg.c \ + firewall/user_ipsec_sadb.c if HIP_MIDAUTH -firewall_hipfw_SOURCES += firewall/midauth.c \ - firewall/pisa.c \ +firewall_hipfw_SOURCES += firewall/midauth.c \ + firewall/pisa.c \ firewall/pisa_cert.c endif # NOTE: gtk does not allow for -Wstrict-prototypes, so we need to append AM_CFLAGS agent_hipagent_CFLAGS = @GTK_CFLAGS@ -Werror -Wall -Wcast-align -Wdisabled-optimization -Wundef -fno-strict-aliasing -funit-at-a-time -agent_hipagent_SOURCES = agent/agent.c \ - agent/tools.c \ - agent/connhipd.c \ - agent/hitdb.c \ - agent/gui_interface.c \ - agent/str_var.c \ - agent/language.c +agent_hipagent_SOURCES = agent/agent.c \ + agent/connhipd.c \ + agent/hitdb.c \ + agent/gui_interface.c \ + agent/language.c \ + agent/str_var.c \ + agent/tools.c # NOTE: gtk does not allow for -Wstrict-prototypes, so we need to append AM_CFLAGS lib_gui_libhipgui_la_CFLAGS = @GTK_CFLAGS@ -Werror -Wall -Wcast-align -Wdisabled-optimization -Wundef -fno-strict-aliasing -funit-at-a-time -lib_gui_libhipgui_la_SOURCES = lib/gui/hipgui.c \ - lib/gui/widgets.c \ - lib/gui/tools.c \ - lib/gui/events.c \ - lib/gui/create.c \ - lib/gui/dragndrop.c +lib_gui_libhipgui_la_SOURCES = lib/gui/create.c \ + lib/gui/dragndrop.c \ + lib/gui/events.c \ + lib/gui/hipgui.c \ + lib/gui/tools.c \ + lib/gui/widgets.c lib_conf_libhipconf_la_SOURCES = lib/conf/hipconf.c -lib_core_libhipcore_la_SOURCES = lib/core/builder.c \ - lib/core/hashtable.c \ - lib/core/hashtree.c \ - lib/core/prefix.c \ - lib/core/certtools.c \ - lib/core/linkedlist.c \ - lib/core/debug.c \ - lib/core/message.c \ +lib_core_libhipcore_la_SOURCES = lib/core/builder.c \ + lib/core/certtools.c \ + lib/core/crypto.c \ + lib/core/debug.c \ lib/core/esp_prot_common.c \ - lib/core/hostsfiles.c \ - lib/core/filemanip.c \ - lib/core/hashchain.c \ - lib/core/hostid.c \ - lib/core/hip_udp.c \ - lib/core/solve.c \ - lib/core/transform.c \ - lib/core/keylen.c \ - lib/core/hit.c \ - lib/core/straddr.c \ - lib/core/sqlitedbapi.c \ + lib/core/filemanip.c \ + lib/core/hashchain.c \ lib/core/hashchain_store.c \ - lib/core/hip_statistics.c \ - lib/core/crypto.c + lib/core/hashtable.c \ + lib/core/hashtree.c \ + lib/core/hip_statistics.c \ + lib/core/hip_udp.c \ + lib/core/hit.c \ + lib/core/hostid.c \ + lib/core/hostsfiles.c \ + lib/core/keylen.c \ + lib/core/linkedlist.c \ + lib/core/message.c \ + lib/core/prefix.c \ + lib/core/solve.c \ + lib/core/sqlitedbapi.c \ + lib/core/straddr.c \ + lib/core/transform.c if HIP_PRIVSEP lib_core_libhipcore_la_SOURCES += lib/core/hip_capability.c endif -lib_tool_libhiptool_la_SOURCES = lib/tool/pk.c \ - lib/tool/nlink.c \ - lib/tool/lutil.c \ - lib/tool/checksum.c +lib_tool_libhiptool_la_SOURCES = lib/tool/checksum.c \ + lib/tool/lutil.c \ + lib/tool/nlink.c \ + lib/tool/pk.c ############################ NOTE ################################## # @@ -322,82 +312,80 @@ # NOTE: this would overwrite AM_CFLAGS, so we need to append it lib_dht_libhipdht_la_CFLAGS = `xml2-config --cflags` @AM_CFLAGS@ -lib_dht_libhipdht_la_SOURCES = lib/dht/libhipdht.c \ +lib_dht_libhipdht_la_SOURCES = lib/dht/libhipdht.c \ lib/dht/libhipdhtxml.c i3_aeshash_libaes_a_SOURCES = i3/aeshash/aescrypp.c \ i3/aeshash/aescrypt.c \ - i3/aeshash/aeshash.c \ - i3/aeshash/aeskey.c \ + i3/aeshash/aeshash.c \ + i3/aeshash/aeskey.c \ i3/aeshash/aeskeypp.c \ i3/aeshash/aestab.c -i3_chord_libchord_a_SOURCES = i3/chord/api.c \ - i3/chord/eprintf.c \ - i3/chord/hosts.c \ - i3/chord/pack.c \ - i3/chord/sendpkt.c \ - i3/chord/chord.c \ - i3/chord/finger.c \ - i3/chord/join.c \ - i3/chord/process.c \ - i3/chord/stabilize.c \ - i3/chord/util.c \ +i3_chord_libchord_a_SOURCES = i3/chord/api.c \ + i3/chord/chord.c \ + i3/chord/eprintf.c \ + i3/chord/finger.c \ + i3/chord/hosts.c \ + i3/chord/join.c \ + i3/chord/pack.c \ + i3/chord/process.c \ + i3/chord/sendpkt.c \ + i3/chord/stabilize.c \ + i3/chord/util.c \ i3/utils/gen_utils.c -i3_chord_gen_conf_SOURCES = i3/chord/gen_conf.c +i3_chord_chord_getfingers_SOURCES = i3/chord/chord_getfingers.c \ + ${i3_chord_libchord_a_SOURCES} +i3_chord_gen_conf_SOURCES = i3/chord/gen_conf.c i3_chord_gen_conf_same_SOURCES = i3/chord/gen_conf_same.c - -i3_chord_test_SOURCES = i3/chord/test.c - -i3_chord_chord_getfingers_SOURCES = i3/chord/chord_getfingers.c \ - ${i3_chord_libchord_a_SOURCES} - -i3_chord_chord_traceroute_SOURCES = i3/chord/chord_traceroute.c \ +i3_chord_test_SOURCES = i3/chord/test.c + +i3_chord_chord_traceroute_SOURCES = i3/chord/chord_traceroute.c \ ${i3_chord_libchord_a_SOURCES} # NOTE: this would overwrite AM_CFLAGS, so we need to append it i3_i3_libi3_a_CFLAGS = `xml2-config --cflags` @AM_CFLAGS@ -i3_i3_libi3_a_SOURCES = i3/i3/i3_addr.c \ - i3/i3/i3_config.c \ - i3/i3/i3_id.c \ - i3/i3/i3_options.c \ - i3/i3/i3_tcp_fns.c \ - i3/i3/i3_utils.c \ - i3/i3/i3_api.c \ - i3/i3/i3_header.c \ - i3/i3/i3_misc.c \ - i3/i3/i3_stack.c \ - i3/i3/i3_trigger.c \ - i3/i3/i3_ping.c \ +i3_i3_libi3_a_SOURCES = i3/i3/i3_addr.c \ + i3/i3/i3_api.c \ + i3/i3/i3_config.c \ + i3/i3/i3_header.c \ + i3/i3/i3_id.c \ + i3/i3/i3_misc.c \ + i3/i3/i3_options.c \ + i3/i3/i3_ping.c \ + i3/i3/i3_stack.c \ + i3/i3/i3_tcp_fns.c \ + i3/i3/i3_trigger.c \ + i3/i3/i3_utils.c \ i3/i3/token_bucket.c -i3_i3_client_libi3client_a_SOURCES = i3/i3_client/downhill_simplex.c \ - i3/i3_client/coordinates.c \ - i3/i3_client/i3_client_api.c \ - i3/i3_client/i3_client_api_ctx.c \ - i3/i3_client/i3_client_api_ext.c \ - i3/i3_client/i3_client_callback.c \ - i3/i3_client/i3_client_context.c \ - i3/i3_client/i3_client_fd.c \ - i3/i3_client/i3_client_id.c \ - i3/i3_client/i3_client_pkt.c \ - i3/i3_client/i3_client_timer.c \ - i3/i3_client/i3_client_trigger.c \ - i3/i3_client/i3server_list.c \ - i3/i3_client/ping.c \ - i3/i3_client/ping_thread.c \ - i3/i3_client/http.c \ +i3_i3_client_libi3client_a_SOURCES = i3/i3_client/coordinates.c \ + i3/i3_client/downhill_simplex.c \ + i3/i3_client/http.c \ + i3/i3_client/i3_client_api.c \ + i3/i3_client/i3_client_api_ctx.c \ + i3/i3_client/i3_client_api_ext.c \ + i3/i3_client/i3_client_callback.c \ + i3/i3_client/i3_client_context.c \ + i3/i3_client/i3_client_fd.c \ + i3/i3_client/i3_client_id.c \ + i3/i3_client/i3_client_pkt.c \ + i3/i3_client/i3_client_timer.c \ + i3/i3_client/i3_client_trigger.c \ + i3/i3_client/i3server_list.c \ + i3/i3_client/ping.c \ + i3/i3_client/ping_thread.c \ i3/i3_client/qsort.c -i3_utils_libutils_a_SOURCES = i3/utils/byteorder.c \ - i3/utils/eprintf.c \ - i3/utils/gen_utils.c \ - i3/utils/inetfns.c \ - i3/utils/event.c \ +i3_utils_libutils_a_SOURCES = i3/utils/byteorder.c \ + i3/utils/eprintf.c \ + i3/utils/event.c \ + i3/utils/gen_utils.c \ + i3/utils/inetfns.c \ i3/utils/netwrap_posix.c ### *_LDADD ### @@ -487,9 +475,9 @@ endif if HIP_PERFORMANCE -test_dh_performance_LDADD = lib/core/libhipcore.la \ - lib/tool/libhiptool.la \ - lib/performance/libperformance.la +test_dh_performance_LDADD = lib/core/libhipcore.la \ + lib/performance/libperformance.la \ + lib/tool/libhiptool.la endif tools_hipconf_LDADD = lib/conf/libhipconf.la \ @@ -512,8 +500,8 @@ tools_pisacert_LDADD += lib/performance/libperformance.la endif -hipd_hipd_LDADD = lib/core/libhipcore.la \ - lib/conf/libhipconf.la \ +hipd_hipd_LDADD = lib/conf/libhipconf.la \ + lib/core/libhipcore.la \ lib/tool/libhiptool.la if HIP_PERFORMANCE @@ -522,8 +510,8 @@ if HIP_I3 hipd_hipd_LDADD += i3/i3_client/libi3client.a \ - i3/i3/libi3.a \ - i3/utils/libutils.a \ + i3/i3/libi3.a \ + i3/utils/libutils.a \ i3/aeshash/libaes.a endif @@ -552,7 +540,7 @@ # TODO fix dependency between libhipcore and libhipconf if possible # TODO fix dependency between libhipconf and libhipdht if possible # TODO fix dependency between (libhipconf, libhipcore) and libhiptool if possible -agent_hipagent_LDADD = lib/gui/libhipgui.la \ +agent_hipagent_LDADD = lib/gui/libhipgui.la \ lib/conf/libhipconf.la \ lib/core/libhipcore.la \ lib/tool/libhiptool.la @@ -564,11 +552,11 @@ agent_hipagent_LDADD += lib/performance/libperformance.la endif -GTKLDADD = `pkg-config gtk+-2.0 --libs` +GTKLDADD = `pkg-config --libs gtk+-2.0` GTHREADLDADD = `pkg-config --cflags --libs gthread-2.0` GOBJECTLDADD = `pkg-config --cflags --libs gobject-2.0` -agent_hipagent_LDFLAGS = $(GTKLDADD) \ +agent_hipagent_LDFLAGS = $(GTKLDADD) \ $(GTHREADLDADD) \ $(GOBJECTLDADD) endif #HIP_AGENT @@ -576,15 +564,11 @@ if HIP_I3 APP_LDADD = i3/chord/libchord.a -i3_chord_gen_conf_LDADD = $(APP_LDADD) - -i3_chord_gen_conf_same_LDADD = $(APP_LDADD) - -i3_chord_test_LDADD = $(APP_LDADD) - i3_chord_chord_getfingers_LDADD = $(APP_LADD) - i3_chord_chord_traceroute_LDADD = $(APP_LADD) +i3_chord_gen_conf_LDADD = $(APP_LDADD) +i3_chord_gen_conf_same_LDADD = $(APP_LDADD) +i3_chord_test_LDADD = $(APP_LDADD) endif # HIP_I3 CLEANFILES = tools/hipdnsproxy tools/hipdnskeyparse @@ -595,33 +579,33 @@ # These two scripts are generated in the end to get the python paths correct. # Currently, I don't know a better way to deal with the python code. -miika -dist_sbin_SCRIPTS = tools/hipdnsproxy \ - tools/hipdnskeyparse \ +dist_sbin_SCRIPTS = tools/hipdnskeyparse \ + tools/hipdnsproxy \ tools/nsupdate.pl -dns_PYTHON = tools/DNS/Base.py \ - tools/DNS/Lib.py \ - tools/DNS/Type.py \ - tools/DNS/Class.py \ - tools/DNS/Opcode.py \ - tools/DNS/win32dns.py \ - tools/DNS/__init__.py \ - tools/DNS/pyip6.py \ - tools/DNS/lazy.py \ - tools/DNS/Status.py \ - tools/DNS/Serialization.py +dns_PYTHON = tools/DNS/__init__.py \ + tools/DNS/Base.py \ + tools/DNS/Class.py \ + tools/DNS/lazy.py \ + tools/DNS/Lib.py \ + tools/DNS/Opcode.py \ + tools/DNS/pyip6.py \ + tools/DNS/Serialization.py \ + tools/DNS/Status.py \ + tools/DNS/Type.py \ + tools/DNS/win32dns.py dnsdir = $(pyexecdir)/tools/DNS -tools_hipdnsproxy_PYTHON = tools/dnsproxy.py \ - tools/pyip6.py \ - tools/hosts.py \ +tools_hipdnsproxy_PYTHON = tools/dnsproxy.py \ + tools/hosts.py \ + tools/pyip6.py \ tools/util.py tools_hipdnsproxydir = $(pyexecdir)/tools/hipdnsproxy -tools_hipdnskeyparse_PYTHON = tools/parse-key-3.py \ - tools/myasn.py +tools_hipdnskeyparse_PYTHON = tools/myasn.py \ + tools/parse-key-3.py tools_hipdnskeyparsedir = $(pyexecdir)/tools/hipdnskeyparse @@ -656,10 +640,10 @@ rm -f ltmain.sh m4/*.m4 Makefile.in missing py-compile # Do not check headers that have issues we cannot fix. -NOCHECK_HEADER_LIST = $(wildcard $(srcdir)/lib/gui/*.h) +NOCHECK_HEADER_LIST = $(wildcard $(srcdir)/lib/gui/*.h) HIPL_HEADER_FILTERED = $(filter-out $(NOCHECK_HEADER_LIST),$(HIPL_HEADER_LIST)) -HIPL_HEADER_OBJS = $(subst $(srcdir),$(builddir),$(HIPL_HEADER_FILTERED:.h=.ho)) -CLEANFILES += $(HIPL_HEADER_OBJS) +HIPL_HEADER_OBJS = $(subst $(srcdir),$(builddir),$(HIPL_HEADER_FILTERED:.h=.ho)) +CLEANFILES += $(HIPL_HEADER_OBJS) checkheaders: $(HIPL_HEADER_OBJS) vpath %.h $(srcdir)