summaryrefslogtreecommitdiff
path: root/usr/src/lib
diff options
context:
space:
mode:
authorToomas Soome <tsoome@me.com>2018-03-23 10:48:57 +0200
committerDan McDonald <danmcd@joyent.com>2018-05-14 08:38:36 -0400
commite86c665f2e10cf29ac3b5f93b53c60bef762a690 (patch)
tree202fcc37fc09c293089e2e62eb1a8f16086226e2 /usr/src/lib
parent2c6e2b378f8445b330094f0316685e546585f44d (diff)
downloadillumos-joyent-e86c665f2e10cf29ac3b5f93b53c60bef762a690.tar.gz
9335 ficl: makesoftcore should be in tools
Reviewed by: Andrew Stormont <andyjstormont@gmail.com> Reviewed by: Andy Fiddaman <omnios@citrus-it.co.uk> Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src/lib')
-rw-r--r--usr/src/lib/libficl/softcore/Makefile24
1 files changed, 6 insertions, 18 deletions
diff --git a/usr/src/lib/libficl/softcore/Makefile b/usr/src/lib/libficl/softcore/Makefile
index 7d62e1ba32..7b42031180 100644
--- a/usr/src/lib/libficl/softcore/Makefile
+++ b/usr/src/lib/libficl/softcore/Makefile
@@ -10,15 +10,15 @@
#
#
-# Copyright 2016 Toomas Soome <tsoome@me.com>
+# Copyright 2018 Toomas Soome <tsoome@me.com>
#
-include $(SRC)/tools/Makefile.tools
+include $(SRC)/Makefile.master
install all: softcore.c
SOFTCORE= $(SRC)/common/ficl/softcore
-PROG = makesoftcore
+PROG= $(ONBLD_TOOLS)/bin/$(MACH)/makesoftcore
#
# not needed: file access
@@ -27,20 +27,8 @@ FR = softcore.fr ifbrack.fr prefix.fr ficl.fr jhlocal.fr marker.fr
FR += freebsd.fr ficllocal.fr oo.fr classes.fr string.fr wordsets.fr
SOURCES= $(FR:%=$(SOFTCORE)/%)
-OBJS= makesoftcore.o lz4.o
-SRCS= makesoftcore.c lz4.c
-LDLIBS= -lumem
-
-CPPFLAGS += -I.. -I$(SRC)/common/ficl
-
-softcore.c: $(PROG) $(SOURCES)
- ./$(PROG) $(SOURCES)
-
-$(PROG): $(OBJS)
- $(LINK.c) -o $@ $(OBJS) $(LDLIBS)
-
-%.o: $(SOFTCORE)/%.c
- $(COMPILE.c) $<
+softcore.c: $(SOURCES)
+ $(PROG) $(SOURCES)
clobber clean:
- $(RM) softcore.c $(OBJS) $(PROG)
+ $(RM) softcore.c