Makefile fix: define RANLIB in makefile, more robust DIRS definition

diff --git a/Makefile b/Makefile
index be3d181..a874b5d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,13 @@
 B:=src
 SRCS:=$(sort $(wildcard src/*/*.c))
 OBJS:=$(SRCS:src/%.c=$(B)/%.o)
-DIRS:=$(patsubst src/%,%,$(filter-out src/REPORT,$(sort $(wildcard src/*))))
+DIRS:=$(patsubst src/%/,%,$(sort $(dir $(SRCS))))
 BDIRS:=$(DIRS:%=$(B)/%)
 NAMES:=$(SRCS:src/%.c=%)
 CFLAGS:=-Isrc/common
 LDLIBS:=$(B)/common/libtest.a
+AR = $(CROSS_COMPILE)ar
+RANLIB = $(CROSS_COMPILE)ranlib
 
 all:
 %.mk:

diff --git a/config.mak.def b/config.mak.def
index 8249b9b..91828bb 100644 (file)
--- a/config.mak.def
+++ b/config.mak.def
@@ -8,6 +8,3 @@ LDLIBS += -lpthread -lm -lrt
 CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
 LDLIBS += -lcrypt -ldl -lresolv -lutil
 
-AR      = $(CROSS_COMPILE)ar
-RANLIB  = $(CROSS_COMPILE)ranlib
-