summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2009-10-07 23:01:44 -0400
committerMike Frysinger <vapier@gentoo.org>2009-10-07 23:02:54 -0400
commit272c8e6264e0bd7a945a493e313ce909e20e814a (patch)
tree6c8c3117981a7c3e577e5a0f0afacb32c87c4517
parentaef262eb5a7f32ec4c768fe1a5f208fa9b8862d3 (diff)
resolv/crypt: convert to foo-y kbuild style
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-rw-r--r--libcrypt/Makefile.in17
-rw-r--r--libresolv/Makefile.in6
2 files changed, 8 insertions, 15 deletions
diff --git a/libcrypt/Makefile.in b/libcrypt/Makefile.in
index 34eb1193c..cb1c5d326 100644
--- a/libcrypt/Makefile.in
+++ b/libcrypt/Makefile.in
@@ -18,14 +18,11 @@ libcrypt_FULL_NAME := libcrypt-$(VERSION).so
libcrypt_DIR := $(top_srcdir)libcrypt
libcrypt_OUT := $(top_builddir)libcrypt
-ifeq ($(UCLIBC_HAS_CRYPT_IMPL),y)
-CSRC := crypt.c des.c md5.c
-endif
-ifeq ($(UCLIBC_HAS_CRYPT_STUB),y)
-CSRC := crypt_stub.c
-endif
+libcrypt_SRC-y :=
+libcrypt_SRC-$(UCLIBC_HAS_CRYPT_IMPL) += crypt.c des.c md5.c
+libcrypt_SRC-$(UCLIBC_HAS_CRYPT_STUB) += crypt_stub.c
-libcrypt_SRC := $(addprefix $(libcrypt_DIR)/,$(CSRC))
+libcrypt_SRC := $(addprefix $(libcrypt_DIR)/,$(libcrypt_SRC-y))
libcrypt_OBJ := $(patsubst $(libcrypt_DIR)/%.c,$(libcrypt_OUT)/%.o,$(libcrypt_SRC))
ifeq ($(DOPIC),y)
@@ -35,10 +32,8 @@ libcrypt-a-y := $(libcrypt_OBJ)
endif
libcrypt-so-y := $(libcrypt_OBJ:.o=.os)
-ifeq ($(UCLIBC_HAS_CRYPT),y)
-lib-a-y += $(top_builddir)lib/libcrypt.a
-lib-so-y += $(top_builddir)lib/libcrypt.so
-endif
+lib-a-$(UCLIBC_HAS_CRYPT) += $(top_builddir)lib/libcrypt.a
+lib-so-$(UCLIBC_HAS_CRYPT) += $(top_builddir)lib/libcrypt.so
objclean-y += libcrypt_clean
ifeq ($(DOMULTI),n)
diff --git a/libresolv/Makefile.in b/libresolv/Makefile.in
index 879603be7..efd0d9297 100644
--- a/libresolv/Makefile.in
+++ b/libresolv/Makefile.in
@@ -28,10 +28,8 @@ libresolv-a-y := $(libresolv_OBJ)
endif
libresolv-so-y := $(libresolv_OBJ:.o=.os)
-ifeq ($(UCLIBC_HAS_RESOLV_STUB),y)
-lib-a-y += $(top_builddir)lib/libresolv.a
-lib-so-y += $(top_builddir)lib/libresolv.so
-endif
+lib-a-$(UCLIBC_HAS_RESOLV_STUB) += $(top_builddir)lib/libresolv.a
+lib-so-$(UCLIBC_HAS_RESOLV_STUB) += $(top_builddir)lib/libresolv.so
objclean-y += libresolv_clean
ifeq ($(DOPIC),y)