[eggheads-patches] PATCH: mod-makefile-changes.diff

Tothwolf tothwolf at concentric.net
Sun Oct 17 15:15:06 CST 1999


mod-makefile-changes.diff:
  More src/mod/*.mod/Makefile changes to simplify and to be more compatible
  Added configure check for snprintf()

-Toth
-------------- next part --------------
diff -urNPX ../exclude ../eggdrop1.3.cvs/Makefile.in ./Makefile.in
--- ../eggdrop1.3.cvs/Makefile.in	Sat Oct 16 20:04:06 1999
+++ ./Makefile.in	Sun Oct 17 14:04:18 1999
@@ -88,6 +88,8 @@
 
 clean:
 	@rm -f $(EGGEXEC) *.so *.stamp core DEBUG *~
+	@cd doc; $(MAKE) clean
+	@cd scripts $(MAKE) clean
 	@cd src; $(MAKE) clean
 	@cd src/md5; $(MAKE) clean
 	@cd src/mod; $(MAKE) clean
@@ -96,7 +98,7 @@
 	@rm -f Makefile doc/Makefile scripts/Makefile src/Makefile src/md5/Makefile src/mod/Makefile
 	@rm -f config.cache config.log config.status config.h lush.h
 
-distrib: distclean Makefile.in
+distrib: distclean
 	@rm -f `find . \( -name '*~' -o -name '*#' -o -name '*.orig' \
 		-o -name '*.rej' -o -name '*.bak' \) -print`
 	@rm -rf `find . \( -name "CVS" \) -print`
diff -urNPX ../exclude ../eggdrop1.3.cvs/config.h.in ./config.h.in
--- ../eggdrop1.3.cvs/config.h.in	Fri Oct 15 11:31:02 1999
+++ ./config.h.in	Sun Oct 17 14:58:54 1999
@@ -47,6 +47,9 @@
 /* Define if you have the dprintf function  */
 #undef HAVE_DPRINTF
 
+/* Define if you have the snprintf function  */
+#undef HAVE_SNPRINTF
+
 /* Define if you have the sigaction function.  */
 #undef HAVE_SIGACTION
 
diff -urNPX ../exclude ../eggdrop1.3.cvs/configure ./configure
--- ../eggdrop1.3.cvs/configure	Sat Oct 16 20:04:07 1999
+++ ./configure	Sun Oct 17 15:01:12 1999
@@ -1164,7 +1164,7 @@
 fi
 
 
-for ac_prog in gawk mawk nawk awk
+for ac_prog in mawk gawk nawk awk
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -2428,7 +2428,7 @@
 
 
 
-for ac_func in rename getrusage getdtablesize srandom random sigaction
+for ac_func in clock getrusage setpgid uname sigaction sigemptyset
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 echo "configure:2435: checking for $ac_func" >&5
@@ -2483,7 +2483,7 @@
 fi
 done
 
-for ac_func in sigemptyset vsprintf strcasecmp setpgid clock dlopen
+for ac_func in rename strcasecmp getdtablesize bzero random srandom
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 echo "configure:2490: checking for $ac_func" >&5
@@ -2538,7 +2538,7 @@
 fi
 done
 
-for ac_func in dprintf bzero uname vsnprintf
+for ac_func in dprintf snprintf vsprintf vsnprintf dlopen
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 echo "configure:2545: checking for $ac_func" >&5
diff -urNPX ../exclude ../eggdrop1.3.cvs/configure.in ./configure.in
--- ../eggdrop1.3.cvs/configure.in	Sat Oct 16 20:04:07 1999
+++ ./configure.in	Sun Oct 17 15:00:29 1999
@@ -290,9 +290,9 @@
 AC_CHECK_SIZEOF(int,0)
 
 dnl Checks for library functions.
-AC_CHECK_FUNCS(rename getrusage getdtablesize srandom random sigaction)
-AC_CHECK_FUNCS(sigemptyset vsprintf strcasecmp setpgid clock dlopen)
-AC_CHECK_FUNCS(dprintf bzero uname vsnprintf)
+AC_CHECK_FUNCS(clock getrusage setpgid uname sigaction sigemptyset)
+AC_CHECK_FUNCS(rename strcasecmp getdtablesize bzero random srandom)
+AC_CHECK_FUNCS(dprintf snprintf vsprintf vsnprintf dlopen)
 
 if test "x${ac_cv_func_vsprintf}" = "xno"
 then
diff -urNPX ../exclude ../eggdrop1.3.cvs/src/mod/Makefile.in ./src/mod/Makefile.in
--- ../eggdrop1.3.cvs/src/mod/Makefile.in	Sat Oct 16 20:04:07 1999
+++ ./src/mod/Makefile.in	Sun Oct 17 14:45:17 1999
@@ -17,15 +17,15 @@
 	@cd $(top_srcdir); $(MAKE)
 
 clean:
-	@rm -f *.o *~ static.h
-	@for i in *.mod; do cd $$i; $(MAKE) 'MAKE=$(MAKE)' clean; cd ..; done
+	@rm -f *.o *.so *~ static.h
+	@for i in *.mod; do cd $$i; $(MAKE) 'MAKE=$(MAKE)' clean; cd ../; done
 
 modules:
-	@for i in *.mod; do cd $$i; $(MAKE_MOD) modules; cd ..; done
+	@for i in *.mod; do cd $$i; $(MAKE_MOD) modules; cd ../; done
 
 static:
 	@./buildstatic
-	@for i in *.mod; do cd $$i; $(MAKE_MOD) static; cd ..; done
+	@for i in *.mod; do cd $$i; $(MAKE_MOD) static; cd ../; done
 
 install: install-help install-language
 
diff -urNPX ../exclude ../eggdrop1.3.cvs/src/mod/assoc.mod/Makefile ./src/mod/assoc.mod/Makefile
--- ../eggdrop1.3.cvs/src/mod/assoc.mod/Makefile	Sat Oct 16 20:04:07 1999
+++ ./src/mod/assoc.mod/Makefile	Sun Oct 17 13:54:23 1999
@@ -4,24 +4,21 @@
 	@echo ""
 	@echo "Let's try this from the right directory..."
 	@echo ""
-	@cd ../../..; make
+	@cd ../../../; make
 
 clean:
 	@rm -f *.o *.so *~
 
-modules: ../../../assoc.so
-
 static: ../assoc.o
 
-assoc.o: ../module.h ../modvals.h ../../eggdrop.h ../../tandem.h
+modules: ../../../assoc.so
+
+../assoc.o: ../module.h ../modvals.h ../../eggdrop.h ../../tandem.h
 	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c assoc.c
+	mv assoc.o ../
 
-../../../assoc.so: assoc.o
-	$(LD) -o ../../../assoc.so assoc.o
+../../../assoc.so: ../assoc.o
+	$(LD) -o ../../../assoc.so ../assoc.o
 	$(STRIP) ../../../assoc.so
-
-../assoc.o: assoc.o
-	@rm -f ../assoc.o
-	@ln -s assoc.mod/assoc.o ..
 
 #safety hash
diff -urNPX ../exclude ../eggdrop1.3.cvs/src/mod/blowfish.mod/Makefile ./src/mod/blowfish.mod/Makefile
--- ../eggdrop1.3.cvs/src/mod/blowfish.mod/Makefile	Sat Oct 16 20:04:07 1999
+++ ./src/mod/blowfish.mod/Makefile	Sun Oct 17 13:56:04 1999
@@ -4,24 +4,21 @@
 	@echo ""
 	@echo "Let's try this from the right directory..."
 	@echo ""
-	@cd ../../..; make
+	@cd ../../../; make
 
 clean:
 	@rm -f *.o *.so *~
 
-modules: ../../../blowfish.so
-
 static: ../blowfish.o
 
-blowfish.o: ../module.h ../modvals.h ../../eggdrop.h bf_tab.h blowfish.h
+modules: ../../../blowfish.so
+
+../blowfish.o: ../module.h ../modvals.h ../../eggdrop.h bf_tab.h blowfish.h
 	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c blowfish.c
+	mv blowfish.o ../
 
-../../../blowfish.so: blowfish.o
-	$(LD) -o ../../../blowfish.so blowfish.o
+../../../blowfish.so: ../blowfish.o
+	$(LD) -o ../../../blowfish.so ../blowfish.o
 	$(STRIP) ../../../blowfish.so
-
-../blowfish.o: blowfish.o
-	@rm -f ../blowfish.o
-	@ln -s blowfish.mod/blowfish.o ..
 
 #safety hash
diff -urNPX ../exclude ../eggdrop1.3.cvs/src/mod/buildstatic ./src/mod/buildstatic
--- ../eggdrop1.3.cvs/src/mod/buildstatic	Fri Oct 15 11:23:24 1999
+++ ./src/mod/buildstatic	Sun Oct 17 14:36:19 1999
@@ -5,7 +5,7 @@
 do
 y=`echo $i | sed s/.mod//`
 cat >> static.h << EOF
-char * ${y}_start();
+char *${y}_start();
 EOF
 done
 cat >> static.h << EOF
@@ -15,7 +15,7 @@
 do
 y=`echo $i | sed s/.mod//`
 cat >> static.h << EOF
-check_static("${y}",${y}_start);
+  check_static("${y}", ${y}_start);
 EOF
 done
 cat >> static.h << EOF
diff -urNPX ../exclude ../eggdrop1.3.cvs/src/mod/channels.mod/Makefile ./src/mod/channels.mod/Makefile
--- ../eggdrop1.3.cvs/src/mod/channels.mod/Makefile	Sat Oct 16 20:04:07 1999
+++ ./src/mod/channels.mod/Makefile	Sun Oct 17 13:54:11 1999
@@ -4,25 +4,22 @@
 	@echo ""
 	@echo "Let's try this from the right directory..."
 	@echo ""
-	@cd ../../..; make
+	@cd ../../../; make
 
 clean:
 	@rm -f *.o *.so *~
 
-modules: ../../../channels.so
-
 static: ../channels.o
 
-channels.o: ../module.h ../modvals.h ../../eggdrop.h cmdschan.c tclchan.c \
+modules: ../../../channels.so
+
+../channels.o: ../module.h ../modvals.h ../../eggdrop.h cmdschan.c tclchan.c \
 userchan.c channels.h
 	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c channels.c
+	mv channels.o ../
 
-../../../channels.so: channels.o
-	$(LD) -o ../../../channels.so channels.o
+../../../channels.so: ../channels.o
+	$(LD) -o ../../../channels.so ../channels.o
 	$(STRIP) ../../../channels.so
-
-../channels.o: channels.o
-	@rm -f ../channels.o
-	@ln -s channels.mod/channels.o ..
 
 #safety hash
diff -urNPX ../exclude ../eggdrop1.3.cvs/src/mod/console.mod/Makefile ./src/mod/console.mod/Makefile
--- ../eggdrop1.3.cvs/src/mod/console.mod/Makefile	Sat Oct 16 20:04:08 1999
+++ ./src/mod/console.mod/Makefile	Sun Oct 17 13:55:49 1999
@@ -4,24 +4,21 @@
 	@echo ""
 	@echo "Let's try this from the right directory..."
 	@echo ""
-	@cd ../../..; make
+	@cd ../../../; make
 
 clean:
 	@rm -f *.o *.so *~
 
-modules: ../../../console.so
-
 static: ../console.o
 
-console.o: ../module.h ../modvals.h ../../eggdrop.h
+modules: ../../../console.so
+
+../console.o: ../module.h ../modvals.h ../../eggdrop.h
 	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c console.c
+	mv console.o ../
 
-../../../console.so: console.o
-	$(LD) -o ../../../console.so console.o
+../../../console.so: ../console.o
+	$(LD) -o ../../../console.so ../console.o
 	$(STRIP) ../../../console.so
-
-../console.o: console.o
-	@rm -f ../console.o
-	@ln -s console.mod/console.o ..
 
 #safety hash
diff -urNPX ../exclude ../eggdrop1.3.cvs/src/mod/ctcp.mod/Makefile ./src/mod/ctcp.mod/Makefile
--- ../eggdrop1.3.cvs/src/mod/ctcp.mod/Makefile	Sat Oct 16 20:04:08 1999
+++ ./src/mod/ctcp.mod/Makefile	Sun Oct 17 13:53:56 1999
@@ -4,25 +4,22 @@
 	@echo ""
 	@echo "Let's try this from the right directory..."
 	@echo ""
-	@cd ../../..; make
+	@cd ../../../; make
 
 clean:
 	@rm -f *.o *.so *~
 
-modules: ../../../ctcp.so
-
 static: ../ctcp.o
 
-ctcp.o: ../module.h ../modvals.h ../../eggdrop.h ctcp.h \
+modules: ../../../ctcp.so
+
+../ctcp.o: ../module.h ../modvals.h ../../eggdrop.h ctcp.h \
 ../server.mod/server.h
 	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c ctcp.c
+	mv ctcp.o ../
 
-../../../ctcp.so: ctcp.o
-	$(LD) -o ../../../ctcp.so ctcp.o
+../../../ctcp.so: ../ctcp.o
+	$(LD) -o ../../../ctcp.so ../ctcp.o
 	$(STRIP) ../../../ctcp.so
-
-../ctcp.o: ctcp.o
-	@rm -f ../ctcp.o
-	@ln -s ctcp.mod/ctcp.o ..
 
 #safety hash
diff -urNPX ../exclude ../eggdrop1.3.cvs/src/mod/filesys.mod/Makefile ./src/mod/filesys.mod/Makefile
--- ../eggdrop1.3.cvs/src/mod/filesys.mod/Makefile	Sat Oct 16 20:04:08 1999
+++ ./src/mod/filesys.mod/Makefile	Sun Oct 17 13:55:34 1999
@@ -4,27 +4,24 @@
 	@echo ""
 	@echo "Let's try this from the right directory..."
 	@echo ""
-	@cd ../../..; make
+	@cd ../../../; make
 
 clean:
 	@rm -f *.o *.so *~
 
-modules: ../../../filesys.so
-
 static: ../filesys.o
 
-filesys.o: ../module.h ../modvals.h ../../eggdrop.h filedb.c files.c \
-tclfiles.c files.h filesys.h ../../lang.h ../../tandem.h \
+modules: ../../../filesys.so
+
+../filesys.o: ../module.h ../modvals.h ../../eggdrop.h filedb.c \
+files.c tclfiles.c files.h filesys.h ../../lang.h ../../tandem.h \
 ../transfer.mod/transfer.h
 	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c filesys.c
+	mv filesys.o ../
 
-../../../filesys.so: filesys.o
-	$(LD) -o ../../../filesys.so filesys.o
+../../../filesys.so: ../filesys.o
+	$(LD) -o ../../../filesys.so ../filesys.o
 	$(STRIP) ../../../filesys.so
-
-../filesys.o: filesys.o
-	@rm -f ../filesys.o
-	@ln -s filesys.mod/filesys.o ..
 
 filesys.h: ../transfer.mod/transfer.h ../../lang.h
 
diff -urNPX ../exclude ../eggdrop1.3.cvs/src/mod/irc.mod/Makefile ./src/mod/irc.mod/Makefile
--- ../eggdrop1.3.cvs/src/mod/irc.mod/Makefile	Sat Oct 16 20:04:08 1999
+++ ./src/mod/irc.mod/Makefile	Sun Oct 17 13:53:40 1999
@@ -4,25 +4,22 @@
 	@echo ""
 	@echo "Let's try this from the right directory..."
 	@echo ""
-	@cd ../../..; make
+	@cd ../../../; make
 
 clean:
 	@rm -f *.o *.so *~
 
-modules: ../../../irc.so
-
 static: ../irc.o
 
-irc.o: ../module.h ../modvals.h ../../eggdrop.h chan.c cmdsirc.c mode.c \
+modules: ../../../irc.so
+
+../irc.o: ../module.h ../modvals.h ../../eggdrop.h chan.c cmdsirc.c mode.c \
 msgcmds.c tclirc.c irc.h ../channels.mod/channels.h ../server.mod/server.h
 	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c irc.c
+	mv irc.o ../
 
-../../../irc.so: irc.o
-	$(LD) -o ../../../irc.so irc.o
+../../../irc.so: ../irc.o
+	$(LD) -o ../../../irc.so ../irc.o
 	$(STRIP) ../../../irc.so
-
-../irc.o: irc.o
-	@rm -f ../irc.o
-	@ln -s irc.mod/irc.o ..
 
 #safety hash
diff -urNPX ../exclude ../eggdrop1.3.cvs/src/mod/notes.mod/Makefile ./src/mod/notes.mod/Makefile
--- ../eggdrop1.3.cvs/src/mod/notes.mod/Makefile	Sat Oct 16 20:04:08 1999
+++ ./src/mod/notes.mod/Makefile	Sun Oct 17 13:55:18 1999
@@ -4,25 +4,22 @@
 	@echo ""
 	@echo "Let's try this from the right directory..."
 	@echo ""
-	@cd ../../..; make
+	@cd ../../../; make
 
 clean:
 	@rm -f *.o *.so *~
 
-modules: ../../../notes.so
-
 static: ../notes.o
 
-notes.o: ../module.h ../modvals.h ../../eggdrop.h cmdsnote.c notes.c \
+modules: ../../../notes.so
+
+../notes.o: ../module.h ../modvals.h ../../eggdrop.h cmdsnote.c notes.c \
 notes.h ../../tandem.h
 	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c notes.c
+	mv notes.o ../
 
-../../../notes.so: notes.o
-	$(LD) -o ../../../notes.so notes.o
+../../../notes.so: ../notes.o
+	$(LD) -o ../../../notes.so ../notes.o
 	$(STRIP) ../../../notes.so
-
-../notes.o: notes.o
-	@rm -f ../notes.o
-	@ln -s notes.mod/notes.o ..
 
 #safety hash
diff -urNPX ../exclude ../eggdrop1.3.cvs/src/mod/seen.mod/Makefile ./src/mod/seen.mod/Makefile
--- ../eggdrop1.3.cvs/src/mod/seen.mod/Makefile	Sat Oct 16 20:04:08 1999
+++ ./src/mod/seen.mod/Makefile	Sun Oct 17 13:53:24 1999
@@ -4,25 +4,22 @@
 	@echo ""
 	@echo "Let's try this from the right directory..."
 	@echo ""
-	@cd ../../..; make
+	@cd ../../../; make
 
 clean:
 	@rm -f *.o *.so *~
 
-modules: ../../../seen.so
-
 static: ../seen.o
 
-seen.o: ../module.h ../modvals.h ../../eggdrop.h seen.c \
+modules: ../../../seen.so
+
+../seen.o: ../module.h ../modvals.h ../../eggdrop.h \
 ../channels.mod/channels.h ../../chan.h ../../users.h
 	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c seen.c
+	mv seen.o ../
 
-../../../seen.so: seen.o
-	$(LD) -o ../../../seen.so seen.o
+../../../seen.so: ../seen.o
+	$(LD) -o ../../../seen.so ../seen.o
 	$(STRIP) ../../../seen.so
-
-../seen.o: seen.o
-	@rm -f ../seen.o
-	@ln -s seen.mod/seen.o ..
 
 #safety hash
diff -urNPX ../exclude ../eggdrop1.3.cvs/src/mod/server.mod/Makefile ./src/mod/server.mod/Makefile
--- ../eggdrop1.3.cvs/src/mod/server.mod/Makefile	Sat Oct 16 20:04:08 1999
+++ ./src/mod/server.mod/Makefile	Sun Oct 17 13:55:02 1999
@@ -4,25 +4,22 @@
 	@echo ""
 	@echo "Let's try this from the right directory..."
 	@echo ""
-	@cd ../../..; make
+	@cd ../../../; make
 
 clean:
 	@rm -f *.o *.so *~
 
-modules: ../../../server.so
-
 static: ../server.o
 
-server.o: ../module.h ../modvals.h ../../eggdrop.h cmdsserv.c server.c \
+modules: ../../../server.so
+
+../server.o: ../module.h ../modvals.h ../../eggdrop.h cmdsserv.c server.c \
 servmsg.c server.h
 	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c server.c
+	mv server.o ../
 
-../../../server.so: server.o
-	$(LD) -o ../../../server.so server.o
+../../../server.so: ../server.o
+	$(LD) -o ../../../server.so ../server.o
 	$(STRIP) ../../../server.so
-
-../server.o: server.o
-	@rm -f ../server.o
-	@ln -s server.mod/server.o ..
 
 #safety hash
diff -urNPX ../exclude ../eggdrop1.3.cvs/src/mod/share.mod/Makefile ./src/mod/share.mod/Makefile
--- ../eggdrop1.3.cvs/src/mod/share.mod/Makefile	Sat Oct 16 20:04:08 1999
+++ ./src/mod/share.mod/Makefile	Sun Oct 17 13:56:28 1999
@@ -4,25 +4,22 @@
 	@echo ""
 	@echo "Let's try this from the right directory..."
 	@echo ""
-	@cd ../../..; make
+	@cd ../../../; make
 
 clean:
 	@rm -f *.o *.so *~
 
-modules: ../../../share.so
-
 static: ../share.o
 
-share.o: ../module.h ../modvals.h ../../eggdrop.h share.c ../../chan.h \
+modules: ../../../share.so
+
+../share.o: ../module.h ../modvals.h ../../eggdrop.h share.c ../../chan.h \
 ../../users.h ../channels.mod/channels.h ../transfer.mod/transfer.h
 	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c share.c
+	mv share.o ../
 
-../../../share.so: share.o
-	$(LD) -o ../../../share.so share.o
+../../../share.so: ../share.o
+	$(LD) -o ../../../share.so ../share.o
 	$(STRIP) ../../../share.so
-
-../share.o: share.o
-	@rm -f ../share.o
-	@ln -s share.mod/share.o ..
 
 #safety hash
diff -urNPX ../exclude ../eggdrop1.3.cvs/src/mod/transfer.mod/Makefile ./src/mod/transfer.mod/Makefile
--- ../eggdrop1.3.cvs/src/mod/transfer.mod/Makefile	Sat Oct 16 20:04:08 1999
+++ ./src/mod/transfer.mod/Makefile	Sun Oct 17 13:54:49 1999
@@ -4,25 +4,22 @@
 	@echo ""
 	@echo "Let's try this from the right directory..."
 	@echo ""
-	@cd ../../..; make
+	@cd ../../../; make
 
 clean:
 	@rm -f *.o *.so *~
 
-modules: ../../../transfer.so
-
 static: ../transfer.o
 
-transfer.o: ../module.h ../modvals.h ../../eggdrop.h transfer.h \
+modules: ../../../transfer.so
+
+../transfer.o: ../module.h ../modvals.h ../../eggdrop.h transfer.h \
 ../../tandem.h ../../users.h
 	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c transfer.c
+	mv transfer.o ../
 
-../../../transfer.so: transfer.o
-	$(LD) -o ../../../transfer.so transfer.o
+../../../transfer.so: ../transfer.o
+	$(LD) -o ../../../transfer.so ../transfer.o
 	$(STRIP) ../../../transfer.so
-
-../transfer.o: transfer.o
-	@rm -f ../transfer.o
-	@ln -s transfer.mod/transfer.o ..
 
 #safety hash
diff -urNPX ../exclude ../eggdrop1.3.cvs/src/mod/wire.mod/Makefile ./src/mod/wire.mod/Makefile
--- ../eggdrop1.3.cvs/src/mod/wire.mod/Makefile	Sat Oct 16 20:04:08 1999
+++ ./src/mod/wire.mod/Makefile	Sun Oct 17 13:56:16 1999
@@ -4,25 +4,22 @@
 	@echo ""
 	@echo "Let's try this from the right directory..."
 	@echo ""
-	@cd ../../..; make
+	@cd ../../../; make
 
 clean:
 	@rm -f *.o *.so *~
 
-modules: ../../../wire.so
-
 static: ../wire.o
 
-wire.o: ../module.h ../modvals.h ../../eggdrop.h wire.c wire.h \
+modules: ../../../wire.so
+
+../wire.o: ../module.h ../modvals.h ../../eggdrop.h wire.c wire.h \
 ../../chan.h ../../users.h
 	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c wire.c
+	mv wire.o ../
 
-../../../wire.so: wire.o
-	$(LD) -o ../../../wire.so wire.o
+../../../wire.so: ../wire.o
+	$(LD) -o ../../../wire.so ../wire.o
 	$(STRIP) ../../../wire.so
-
-../wire.o: wire.o
-	@rm -f ../wire.o
-	@ln -s wire.mod/wire.o ..
 
 #safety hash
diff -urNPX ../exclude ../eggdrop1.3.cvs/src/mod/woobie.mod/Makefile ./src/mod/woobie.mod/Makefile
--- ../eggdrop1.3.cvs/src/mod/woobie.mod/Makefile	Sat Oct 16 20:04:08 1999
+++ ./src/mod/woobie.mod/Makefile	Sun Oct 17 13:54:34 1999
@@ -4,24 +4,21 @@
 	@echo ""
 	@echo "Let's try this from the right directory..."
 	@echo ""
-	@cd ../../..; make
+	@cd ../../../; make
 
 clean:
 	@rm -f *.o *.so *~
 
-modules: ../../../woobie.so
-
 static: ../woobie.o
 
-woobie.o: ../module.h ../modvals.h ../../eggdrop.h
+modules: ../../../woobie.so
+
+../woobie.o: ../module.h ../modvals.h ../../eggdrop.h
 	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c woobie.c
+	mv woobie.o ../
 
-../../../woobie.so: woobie.o
-	$(LD) -o ../../../woobie.so woobie.o
+../../../woobie.so: ../woobie.o
+	$(LD) -o ../../../woobie.so ../woobie.o
 	$(STRIP) ../../../woobie.so
-
-../woobie.o: woobie.o
-	@rm -f ../woobie.o
-	@ln -s woobie.mod/woobie.o ..
 
 #safety hash


More information about the Patches mailing list