[pisa-src] r2722 - in trunk: Makefile.am pairing pairing-legacy

  • From: Christoph Viethen <christoph.viethen@xxxxxxxxxxxxxx>
  • To: pisa-src@xxxxxxxxxxxxx
  • Date: Tue, 23 Aug 2011 15:09:00 +0200

Author: viethen
Date: Tue Aug 23 15:08:58 2011
New Revision: 2722

Log:
move old pairing code out of the way (Makefile.am adjusted, too)

Added:
   trunk/pairing-legacy/
      - copied from r2721, trunk/pairing/
Deleted:
   trunk/pairing/
Modified:
   trunk/Makefile.am

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am   Tue Aug 23 12:16:18 2011        (r2721)
+++ trunk/Makefile.am   Tue Aug 23 15:08:58 2011        (r2722)
@@ -5,7 +5,7 @@
 
 HEADER_LIST = community-operator-legacy/*.h  \
               libpisa/*.h              \
-              pairing/*.h              \
+              pairing-legacy/*.h       \
               pisacd/*.h               \
               pisasd/*.h
 
@@ -15,8 +15,8 @@
 # distcleancheck has trouble building the C files below tools/.
 DIST_WILDCARDS = community-operator-legacy/*.cfg  \
                  debian/*                   \
-                 pairing/*.cfg              \
-                 pairing/*.txt              \
+                 pairing-legacy/*.cfg       \
+                 pairing-legacy/*.txt       \
                  pisacd/*.sh                \
                  pisasd/*.sh                \
                  tools/*.cfg                \
@@ -35,8 +35,8 @@
              docs                               \
              kernel                             \
              openwrt                            \
-             pairing/defaults                   \
-             pairing/pisaum                     \
+             pairing-legacy/defaults            \
+             pairing-legacy/pisaum              \
              tools/convenience-scripts          \
              tools/dhcp                         \
              tools/live-cds                     \
@@ -57,10 +57,10 @@
 
 bin_PROGRAMS = community-operator-legacy/co_client \
                community-operator-legacy/co_server \
-               pairing/accept               \
-               pairing/management           \
-               pairing/passgen              \
-               pairing/send                 \
+               pairing-legacy/accept        \
+               pairing-legacy/management    \
+               pairing-legacy/passgen       \
+               pairing-legacy/send          \
                pisacd/pisacdconf            \
                pisasd/pisasdconf            \
                test/checkhipd               \
@@ -104,24 +104,24 @@
 community_operator_legacy_co_server_SOURCES = 
community-operator-legacy/co_server.c \
                                               community-operator-legacy/hipl.c
 
-pairing_COMMON_SRCS        = pairing/common.c            \
-                             pairing/libconfig_wrapper.c
+pairing_legacy_COMMON_SRCS = pairing-legacy/common.c            \
+                             pairing-legacy/libconfig_wrapper.c
 
-pairing_ACCEPT_SEND_SRCS   = $(pairing_COMMON_SRCS)   \
-                             pairing/hash.c           \
-                             pairing/packet_handler.c
+pairing_legacy_ACCEPT_SEND_SRCS = $(pairing_legacy_COMMON_SRCS)   \
+                                  pairing-legacy/hash.c           \
+                                  pairing-legacy/packet_handler.c
 
-pairing_accept_SOURCES     = $(pairing_ACCEPT_SEND_SRCS)     \
-                             pairing/accept.c
+pairing_legacy_accept_SOURCES = $(pairing_legacy_ACCEPT_SEND_SRCS) \
+                                pairing-legacy/accept.c
 
-pairing_send_SOURCES       = $(pairing_ACCEPT_SEND_SRCS)   \
-                             pairing/send.c
+pairing_legacy_send_SOURCES = $(pairing_legacy_ACCEPT_SEND_SRCS)  \
+                              pairing-legacy/send.c
 
-pairing_management_SOURCES = $(pairing_COMMON_SRCS) \
-                             pairing/management.c
+pairing_legacy_management_SOURCES = $(pairing_legacy_COMMON_SRCS) \
+                                    pairing-legacy/management.c
 
-pairing_passgen_SOURCES    = pairing/hash.c    \
-                             pairing/passgen.c
+pairing_legacy_passgen_SOURCES = pairing-legacy/hash.c    \
+                                 pairing-legacy/passgen.c
 
 pisabeacon_pisabeacon_SOURCES = pisabeacon/pisabeacon.c
 
@@ -167,9 +167,9 @@
 
 community_operator_legacy_co_client_LDADD = libpisa/libpisa.la
 community_operator_legacy_co_server_LDADD = libpisa/libpisa.la
-pairing_accept_LDADD               = libpisa/libpisa.la
-pairing_management_LDADD           = libpisa/libpisa.la
-pairing_send_LDADD                 = libpisa/libpisa.la
+pairing_legacy_accept_LDADD        = libpisa/libpisa.la
+pairing_legacy_management_LDADD    = libpisa/libpisa.la
+pairing_legacy_send_LDADD          = libpisa/libpisa.la
 pisabeacon_pisabeacon_LDADD        = libpisa/libpisa.la
 pisacd_pisacd_LDADD                = libpisa/libpisa.la
 pisacd_pisacdconf_LDADD            = libpisa/libpisa.la
-- 
This is the pisa developer mailing list. Please also subscribe to the main pisa 
list at:
//www.freelists.org/list/pisa

Other related posts:

  • » [pisa-src] r2722 - in trunk: Makefile.am pairing pairing-legacy - Christoph Viethen