Make dependencies for alternative objects work on Linux and Illumos.

pamaddox · Oct 4, 2012 · bd83697 · bd83697
1 parent 158ef72
commit bd83697
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/src/Makefile.in b/src/Makefile.in
@@ -130,12 +130,12 @@ FINAL_NOIT_OBJS=$(NOIT_OBJS:%.o=noit-objs/%.o)
 
 all:	reversion $(TARGETS) java-bits make-modules make-man
 
-$(FINAL_NOIT_OBJS):	$(@:noit-objs/%.o=%.o)
+$(FINAL_NOIT_OBJS):
 	@mkdir -p "`dirname $@`"
 	@echo "- making private $@"
 	@cp $(@:noit-objs/%.o=%.o) $@
 
-$(FINAL_STRATCON_OBJS):	$(@:stratcon-objs/%.o=%.o)
+$(FINAL_STRATCON_OBJS):
 	@mkdir -p "`dirname $@`"
 	@echo "- making private $@"
 	@cp $(@:stratcon-objs/%.o=%.o) $@
@@ -323,6 +323,7 @@ install:	install-dirs install-docs install-headers install-noitd install-stratco
 clean:
 	rm -f *.o $(TARGETS)
 	rm -f module-online.h
+	rm -rf noit-objs stratcon-objs
 	(cd jlog && $(MAKE) clean)
 	(cd eventer && $(MAKE) clean)
 	(cd udns && $(MAKE) clean)

diff --git a/src/Makefile.noit.dep b/src/Makefile.noit.dep
@@ -6,6 +6,8 @@ noit-objs/eventer/eventer_SSL_fd_opset.o: eventer/eventer_SSL_fd_opset.o
 noit-objs/eventer/eventer_impl.o: eventer/eventer_impl.o
 noit-objs/eventer/eventer_jobq.o: eventer/eventer_jobq.o
 noit-objs/eventer/eventer_kqueue_impl.o: eventer/eventer_kqueue_impl.o
+noit-objs/eventer/eventer_ports_impl.o: eventer/eventer_ports_impl.o
+noit-objs/eventer/eventer_epoll_impl.o: eventer/eventer_epoll_impl.o
 noit-objs/jlog/jlog.o: jlog/jlog.o
 noit-objs/jlog/jlog_hash.o: jlog/jlog_hash.o
 noit-objs/jlog/jlog_io.o: jlog/jlog_io.o

diff --git a/src/Makefile.stratcon.dep b/src/Makefile.stratcon.dep
@@ -6,6 +6,8 @@ stratcon-objs/eventer/eventer_SSL_fd_opset.o: eventer/eventer_SSL_fd_opset.o
 stratcon-objs/eventer/eventer_impl.o: eventer/eventer_impl.o
 stratcon-objs/eventer/eventer_jobq.o: eventer/eventer_jobq.o
 stratcon-objs/eventer/eventer_kqueue_impl.o: eventer/eventer_kqueue_impl.o
+stratcon-objs/eventer/eventer_ports_impl.o: eventer/eventer_ports_impl.o
+stratcon-objs/eventer/eventer_epoll_impl.o: eventer/eventer_epoll_impl.o
 stratcon-objs/jlog/jlog.o: jlog/jlog.o
 stratcon-objs/jlog/jlog_hash.o: jlog/jlog_hash.o
 stratcon-objs/jlog/jlog_io.o: jlog/jlog_io.o