Browse Source

Missed OBJS definition in libcrypt/libutil. Use := where possible

Peter S. Mazinger 18 years ago
parent
commit
99720814c3
2 changed files with 14 additions and 10 deletions
  1. 7 5
      libcrypt/Makefile
  2. 7 5
      libutil/Makefile

+ 7 - 5
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)

+ 7 - 5
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