diff options
| -rw-r--r-- | libcrypt/Makefile | 12 | ||||
| -rw-r--r-- | libutil/Makefile | 12 |
2 files changed, 14 insertions, 10 deletions
diff --git a/libcrypt/Makefile b/libcrypt/Makefile index a4b8f5980..3b98690be 100644 --- a/libcrypt/Makefile +++ b/libcrypt/Makefile @@ -26,12 +26,14 @@ include $(TOPDIR)Rules.mak CFLAGS+=$(SSP_ALL_CFLAGS) -LIB_NAME=libcrypt -AR_LIB_NAME=$(TOPDIR)lib/$(LIB_NAME).a -SO_LIB_NAME=$(TOPDIR)lib/$(LIB_NAME).so -SO_FULL_NAME=$(LIB_NAME)-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so +LIB_NAME := libcrypt +AR_LIB_NAME := $(TOPDIR)lib/$(LIB_NAME).a +SO_LIB_NAME := $(TOPDIR)lib/$(LIB_NAME).so +SO_FULL_NAME := $(LIB_NAME)-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so -CSRC = $(wildcard *.c) +CSRC := $(wildcard *.c) + +OBJS := $(patsubst %.c,%.o, $(CSRC)) ifeq ($(strip $(HAVE_SHARED)),y) all: $(SO_LIB_NAME) diff --git a/libutil/Makefile b/libutil/Makefile index db440dbf1..15c276be3 100644 --- a/libutil/Makefile +++ b/libutil/Makefile @@ -26,16 +26,18 @@ include $(TOPDIR)Rules.mak CFLAGS+=$(SSP_ALL_CFLAGS) -LIB_NAME=libutil -AR_LIB_NAME=$(TOPDIR)lib/$(LIB_NAME).a -SO_LIB_NAME=$(TOPDIR)lib/$(LIB_NAME).so -SO_FULL_NAME=$(LIB_NAME)-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so +LIB_NAME := libutil +AR_LIB_NAME := $(TOPDIR)lib/$(LIB_NAME).a +SO_LIB_NAME := $(TOPDIR)lib/$(LIB_NAME).so +SO_FULL_NAME := $(LIB_NAME)-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so -CSRC=$(wildcard *.c) +CSRC = $(wildcard *.c) ifneq ($(strip $(ARCH_HAS_MMU)),y) CSRC := $(filter-out forkpty.c,$(CSRC)) endif +OBJS := $(patsubst %.c,%.o, $(CSRC)) + ifeq ($(strip $(HAVE_SHARED)),y) all: $(SO_LIB_NAME) else |