From 99bb7615ca36c79140c9bb7c902ca7f21a2897e1 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 7 Aug 2006 07:51:12 +0000
Subject: * configure.in, common.mk: AIX link issue.  a patch from Yutaka  
 Kanemoto <kinpoco at gmail.com>.  [ruby-dev:29190]

* ext/socket/socket.c: AIX socket support.  [ruby-dev:29190]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@10697 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 common.mk | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'common.mk')

diff --git a/common.mk b/common.mk
index d05592325d..dfc0e98cf7 100644
--- a/common.mk
+++ b/common.mk
@@ -66,16 +66,16 @@ miniruby$(EXEEXT): config.status $(LIBRUBY_A) $(MAINOBJ) $(MINIOBJS) $(OBJS) $(D
 
 $(PROGRAM): $(LIBRUBY) $(MAINOBJ) $(OBJS) $(EXTOBJS) $(SETUP) $(PREP)
 
-$(LIBRUBY_A):	$(OBJS) $(DMYEXT)
+$(LIBRUBY_A):	$(OBJS) $(DMYEXT) $(ARCHFILE)
 
-$(LIBRUBY_SO):	$(OBJS) $(DLDOBJS) $(LIBRUBY_A) $(PREP) $(ARCHFILE)
+$(LIBRUBY_SO):	$(OBJS) $(DLDOBJS) $(LIBRUBY_A) $(PREP)
 
 $(STATIC_RUBY)$(EXEEXT): $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A)
 	@$(RM) $@
 	$(PURIFY) $(CC) $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A) $(MAINLIBS) $(EXTLIBS) $(LIBS) $(OUTFLAG)$@ $(LDFLAGS) $(XLDFLAGS)
 
-ruby.imp: $(LIBRUBY_A)
-	@$(NM) -Pgp $(LIBRUBY_A) | awk 'BEGIN{print "#!"}; $$2~/^[BD]$$/{print $$1}' | sort -u -o $@
+ruby.imp: $(OBJS)
+	@$(NM) -Pgp $(OBJS) | awk 'BEGIN{print "#!"}; $$2~/^[BD]$$/{print $$1}' | sort -u -o $@
 
 install: install-nodoc $(RDOCTARGET)
 install-all: install-nodoc install-doc
@@ -112,6 +112,8 @@ do-install-doc: $(PROGRAM)
 
 pre-install: pre-install-local pre-install-ext
 pre-install-local:: PHONY
+	$(RM) $(prefix)/lib/$(LIBRUBY)
+	$(RM) -r $(prefix)/lib/ruby/$(MAJOR).$(MINOR)/$(arch)
 pre-install-ext:: PHONY
 pre-install-doc:: PHONY
 
-- 
cgit v1.2.3