Skip to content

Commit

Permalink
Fix build on older Illumos
Browse files Browse the repository at this point in the history
 * non-GNU make
 * studio-compiled atomics
  • Loading branch information
postwait committed Oct 4, 2012
1 parent a198c7c commit 158ef72
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions src/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -85,14 +85,16 @@ NOITEDIT_LIB_OBJS=noitedit/chared.o noitedit/common.o noitedit/el.o \
JLOG_LIB_OBJS=jlog/jlog.o jlog/jlog_hash.o jlog/jlog_io.o
EVENTER_OBJS=@EVENTER_OBJS@
EVENTER_IMPL_OBJS=$(EVENTER_OBJS:%.o=eventer/%.o)
ATOMIC_REL_OBJS=@ATOMIC_OBJS@
ATOMIC_OBJS=$(ATOMIC_REL_OBJS:%.o=utils/%.o)
EVENTER_LIB_OBJS=eventer/OETS_asn1_helper.o eventer/eventer.o \
eventer/eventer_POSIX_fd_opset.o eventer/eventer_SSL_fd_opset.o \
eventer/eventer_impl.o eventer/eventer_jobq.o $(EVENTER_IMPL_OBJS)
NOIT_UTILS_OBJS=utils/noit_b32.o utils/noit_b64.o utils/noit_btrie.o \
utils/noit_getip.o utils/noit_hash.o utils/noit_lockfile.o \
utils/noit_log.o utils/noit_mkdir.o utils/noit_security.o \
utils/noit_sem.o utils/noit_skiplist.o utils/noit_str.o \
utils/noit_watchdog.o
utils/noit_watchdog.o $(ATOMIC_OBJS)
YAJL_LIB_OBJS=yajl-lib/yajl.o yajl-lib/yajl_alloc.o yajl-lib/yajl_buf.o \
yajl-lib/yajl_encode.o yajl-lib/yajl_gen.o yajl-lib/yajl_lex.o \
yajl-lib/yajl_parser.o yajl-lib/yajl_tree.o yajl-lib/yajl_version.o
Expand Down Expand Up @@ -192,7 +194,7 @@ noit_@DTRACEHDR@: noit_dtrace_probes.d
cp ./noit_@[email protected] ./noit_@DTRACEHDR@ ; \
else \
echo "- building dtrace header $@" ; \
@DTRACE@ -h -s $< ; \
@DTRACE@ -h -s noit_dtrace_probes.d ; \
fi

stratcon_@DTRACEHDR@: stratcon_dtrace_probes.d
Expand All @@ -201,7 +203,7 @@ stratcon_@DTRACEHDR@: stratcon_dtrace_probes.d
cp ./stratcon_@[email protected] ./stratcon_@DTRACEHDR@ ; \
else \
echo "- building dtrace header $@" ; \
@DTRACE@ -h -s $< ; \
@DTRACE@ -h -s stratcon_dtrace_probes.d ; \
fi

noitd: $(FINAL_NOIT_OBJS) man/noitd.usage.h $(NOITD_DTRACEOBJ)
Expand Down

0 comments on commit 158ef72

Please sign in to comment.