OSDN Git Service

libc/inet: convert to foo-y kbuild style
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Sat, 23 Jan 2010 20:11:47 +0000 (21:11 +0100)
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Sat, 23 Jan 2010 20:11:47 +0000 (21:11 +0100)
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
libc/inet/Makefile.in

index 8131945..a91d37f 100644 (file)
@@ -12,61 +12,47 @@ include $(top_srcdir)libc/inet/rpc/Makefile.in
 INET_DIR := $(top_srcdir)libc/inet
 INET_OUT := $(top_builddir)libc/inet
 
-CSRC :=
-ifneq ($(UCLIBC_HAS_CRYPT_IMPL)$(UCLIBC_HAS_IPV4)$(UCLIBC_HAS_IPV6),)
+CSRC-y :=
 # des uses ntohl
-CSRC += ntohl.c
-endif
-ifneq ($(UCLIBC_HAS_IPV4)$(UCLIBC_HAS_IPV6),)
-CSRC +=        getservice.c getproto.c hostid.c getnetent.c getnetbynm.c getnetbyad.c \
+CSRC-$(findstring y,$(UCLIBC_HAS_CRYPT_IMPL)$(UCLIBC_HAS_IPV4)$(UCLIBC_HAS_IPV6)) += ntohl.c
+CSRC-$(findstring y,$(UCLIBC_HAS_IPV4)$(UCLIBC_HAS_IPV6)) += \
+       getservice.c getproto.c hostid.c getnetent.c getnetbynm.c getnetbyad.c \
        inet_net.c herror.c if_index.c gai_strerror.c getaddrinfo.c \
        ifaddrs.c ntop.c
-endif
-ifeq ($(UCLIBC_HAS_IPV6),y)
-CSRC += in6_addr.c
-endif
-
+CSRC-$(UCLIBC_HAS_IPV6) += in6_addr.c
 # multi source addr.c
-addr_CSRC := \
+CSRC-$(findstring y,$(UCLIBC_HAS_IPV4)$(UCLIBC_HAS_IPV6)) += \
        inet_aton.c inet_addr.c inet_ntoa.c inet_makeaddr.c \
        inet_lnaof.c inet_netof.c
-ifneq ($(UCLIBC_HAS_IPV4)$(UCLIBC_HAS_IPV6),)
-CSRC += $(addr_CSRC)
-endif
-
 # multi source resolv.c
-resolv_CSRC += \
+CSRC-$(findstring y,$(UCLIBC_HAS_IPV4)$(UCLIBC_HAS_IPV6)) += \
        encodeh.c decodeh.c encoded.c decoded.c \
        encodeq.c encodea.c \
+       read_etc_hosts_r.c \
        dnslookup.c opennameservers.c closenameservers.c \
-       read_etc_hosts_r.c get_hosts_byaddr_r.c get_hosts_byname_r.c \
        getnameinfo.c \
-       gethostbyaddr_r.c gethostbyname_r.c gethostbyname2_r.c gethostent_r.c \
-       gethostbyaddr.c gethostbyname.c gethostbyname2.c gethostent.c \
+       gethostent.c gethostent_r.c
+CSRC-$(findstring y,$(UCLIBC_HAS_IPV4)$(UCLIBC_HAS_IPV6)) += \
+       get_hosts_byaddr_r.c get_hosts_byname_r.c \
+       gethostbyaddr_r.c gethostbyname_r.c gethostbyname2_r.c \
+       gethostbyaddr.c gethostbyname.c gethostbyname2.c
+CSRC-$(findstring y,$(UCLIBC_HAS_IPV4)$(UCLIBC_HAS_IPV6)) += \
        res_init.c res_query.c res_comp.c ns_name.c \
        _res_state.c
-ifneq ($(UCLIBC_HAS_IPV4)$(UCLIBC_HAS_IPV6),)
-CSRC += $(resolv_CSRC)
 ## # unused ATM
-## CSRC += encodep.c decodep.c formquery.c
-endif
-
+## CSRC-y += encodep.c decodep.c formquery.c
 
 # multi source socketcalls.c
 socketcalls_CSRC += \
        accept.c bind.c connect.c getpeername.c getsockname.c \
        getsockopt.c listen.c recv.c recvfrom.c recvmsg.c send.c sendmsg.c \
        sendto.c setsockopt.c shutdown.c socket.c socketpair.c
-ifeq ($(UCLIBC_HAS_SOCKET),y)
-CSRC += $(socketcalls_CSRC) opensock.c
-endif
+CSRC-$(UCLIBC_HAS_SOCKET) += $(socketcalls_CSRC) opensock.c
 
-ifneq ($(UCLIBC_HAS_SOCKET)$(UCLIBC_HAS_IPV4)$(UCLIBC_HAS_IPV6),)
-CSRC += ethers.c ether_addr.c
-endif
+CSRC-$(findstring y,$(UCLIBC_HAS_SOCKET)$(UCLIBC_HAS_IPV4)$(UCLIBC_HAS_IPV6)) += ethers.c ether_addr.c
 
-INET_SRC := $(patsubst %.c,$(INET_DIR)/%.c,$(CSRC))
-INET_OBJ := $(patsubst %.c,$(INET_OUT)/%.o,$(CSRC))
+INET_SRC := $(patsubst %.c,$(INET_DIR)/%.c,$(CSRC-y))
+INET_OBJ := $(patsubst %.c,$(INET_OUT)/%.o,$(CSRC-y))
 
 libc-y += $(INET_OBJ)