diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-08-01 20:45:50 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-08-01 20:45:50 +0000 |
commit | 5a827fc9c6c618a9aadeb3917db0edd0d98a5ab0 (patch) | |
tree | 97734c78fda4ccfe358ba599d5a4130491345de4 /src/transport/Makefile.am | |
parent | 4502e8b6210d0aad9a49254fb13d02434d8d763b (diff) | |
download | gnunet-5a827fc9c6c618a9aadeb3917db0edd0d98a5ab0.tar.gz gnunet-5a827fc9c6c618a9aadeb3917db0edd0d98a5ab0.zip |
LRN: Resolve an overlooked merge conflict
Diffstat (limited to 'src/transport/Makefile.am')
-rw-r--r-- | src/transport/Makefile.am | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index 06f09e227..7a9f7cad2 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am | |||
@@ -62,11 +62,9 @@ UNIX_QUOTA_TEST = test_quota_compliance_unix \ | |||
62 | test_quota_compliance_unix_asymmetric_recv_constant | 62 | test_quota_compliance_unix_asymmetric_recv_constant |
63 | endif | 63 | endif |
64 | 64 | ||
65 | <<<<<<< HEAD | 65 | noinst_PROGRAMS = ${check_PROGRAMS} $(WLAN_BIN_DUMMY) |
66 | ======= | 66 | |
67 | noinst_PROGRAMS = ${check_PROGRAMS} gnunet-transport-certificate-creation | ||
68 | 67 | ||
69 | >>>>>>> Let gnunet-transport-certificate-creation be a program | ||
70 | lib_LTLIBRARIES = \ | 68 | lib_LTLIBRARIES = \ |
71 | libgnunettransport.la | 69 | libgnunettransport.la |
72 | 70 | ||
@@ -91,10 +89,6 @@ bin_PROGRAMS = \ | |||
91 | gnunet-transport-list-connections \ | 89 | gnunet-transport-list-connections \ |
92 | gnunet-transport-certificate-creation | 90 | gnunet-transport-certificate-creation |
93 | 91 | ||
94 | #noinst_PROGRAMS = ${check_PROGRAMS} | ||
95 | noinst_PROGRAMS = \ | ||
96 | $(WLAN_BIN_DUMMY) | ||
97 | |||
98 | #bin_SCRIPTS = \ | 92 | #bin_SCRIPTS = \ |
99 | # gnunet-transport-certificate-creation | 93 | # gnunet-transport-certificate-creation |
100 | 94 | ||