[eggheads-patches] PATCH: too-many-fixes+2-part1.diff

Tothwolf tothwolf at concentric.net
Thu Oct 14 15:10:13 CST 1999


too-many-fixes+2-part1.diff:
  Fixed some compilers not liking -c -o rulesets,
  Added 'install-help' and 'install-language' for src/mod/Makefile

-Toth
-------------- next part --------------
diff -urNPX ../exclude ../eggdrop1.3.orig/Makefile.in ./Makefile.in
--- ../eggdrop1.3.orig/Makefile.in	Thu Oct 14 14:03:58 1999
+++ ./Makefile.in	Thu Oct 14 14:09:38 1999
@@ -268,6 +268,7 @@
 			$(INSTALL_DATA) $$i $(DEST)/language/; \
 		done; \
 	fi
+	@cd src/mod/; $(MAKE_INSTALL) install-language
 
 install-help:
 	@if test ! "x`echo help/*.help`" = "xhelp/*.help"; then \
@@ -297,6 +298,7 @@
 			$(INSTALL_DATA) $$i $(DEST)/help/set/; \
 		done; \
 	fi
+	@cd src/mod/; $(MAKE_INSTALL) install-help
 
 install-filesys:
 	@if test ! -d $(DEST)/filesys; then \
diff -urNPX ../exclude ../eggdrop1.3.orig/src/Makefile ./src/Makefile
--- ../eggdrop1.3.orig/src/Makefile	Thu Oct 14 14:03:43 1999
+++ ./src/Makefile	Thu Oct 14 14:06:50 1999
@@ -54,13 +54,13 @@
 
 botcmd.o:
 	@echo "(This will take a while. Go make a pizza or something.)"
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c botcmd.c -o botcmd.o
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c botcmd.c
 
 main.o:
 	$(CC) $(CFLAGS) $(CPPFLAGS) \
 	'-DCCFLAGS="$(CC) $(CFLAGS) $(CPPFLAGS)"' \
 	'-DLDFLAGS="$(LD)"' \
-	'-DSTRIPFLAGS="$(STRIP)"' -c main.c -o main.o
+	'-DSTRIPFLAGS="$(STRIP)"' -c main.c
 
 md5/md5c.o:
 	@cd md5; $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CC)' 'LD=$(LD)' \
@@ -82,7 +82,7 @@
 .SUFFIXES: .c .h .o .a
 
 .c.o:
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $<
 
 botcmd.o: chan.h main.h modules.h tandem.h users.h
 botmsg.o: main.h tandem.h
diff -urNPX ../exclude ../eggdrop1.3.orig/src/md5/Makefile ./src/md5/Makefile
--- ../eggdrop1.3.orig/src/md5/Makefile	Thu Oct 14 14:03:43 1999
+++ ./src/md5/Makefile	Thu Oct 14 14:06:50 1999
@@ -20,6 +20,6 @@
 .SUFFIXES: .c .o .h
 
 .c.o:
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $<
 
 #safety hash
diff -urNPX ../exclude ../eggdrop1.3.orig/src/mod/Makefile ./src/mod/Makefile
--- ../eggdrop1.3.orig/src/mod/Makefile	Thu Oct 14 14:03:58 1999
+++ ./src/mod/Makefile	Thu Oct 14 14:06:50 1999
@@ -3,10 +3,6 @@
 MAKE_MOD = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CC)' 'LD=$(LD)' \
 'STRIP=$(STRIP)' 'CFLAGS=$(CFLAGS)' 
 
-MAKE_INSTALL = $(MAKE) 'DEST=$(DEST)' 'INSTALL=$(INSTALL)' \
-'INSTALL_PROGRAM=$(INSTALL_PROGRAM)' 'INSTALL_DATA=$(INSTALL_DATA)' \
-'INSTALL_SCRIPT=$(INSTALL_SCRIPT)'
-
 doofus:
 	@echo ""
 	@echo "Let's try this from the right directory..."
@@ -23,5 +19,47 @@
 static:
 	@./buildstatic
 	@for i in *.mod; do cd $$i; $(MAKE_MOD) static; cd ..; done
+
+install: install-language install-help
+
+install-language:
+	@if test ! "x`echo *.mod/language/*.lang`" = "x*.mod/language/*.lang"; then \
+		if test ! -d $(DEST)/language; then \
+			echo "Creating 'language' subdirectory."; \
+			$(INSTALL) -d $(DEST)/language; \
+		fi; \
+		for i in *.mod/language/*.lang; do \
+			$(INSTALL_DATA) $$i $(DEST)/language/; \
+		done; \
+	fi
+
+install-help:
+	@if test ! "x`echo *.mod/help/*.help`" = "x*.mod/help/*.help"; then \
+		if test ! -d $(DEST)/help; then \
+			echo "Creating 'help' subdirectory."; \
+			$(INSTALL) -d $(DEST)/help; \
+		fi; \
+		for i in *.mod/help/*.help; do \
+			$(INSTALL_DATA) $$i $(DEST)/help/; \
+		done; \
+	fi
+	@if test ! "x`echo *.mod/help/msg/*.help`" = "x*.mod/help/msg/*.help"; then \
+		if test ! -d $(DEST)/help/msg; then \
+			echo "Creating 'help/msg' subdirectory."; \
+			$(INSTALL) -d $(DEST)/help/msg; \
+		fi; \
+		for i in *.mod/help/msg/*.help; do \
+			$(INSTALL_DATA) $$i $(DEST)/help/msg/; \
+		done; \
+	fi
+	@if test ! "x`echo *.mod/help/set/*.help`" = "x*.mod/help/set/*.help"; then \
+		if test ! -d $(DEST)/help/set; then \
+			echo "Creating 'help/set' subdirectory."; \
+			$(INSTALL) -d $(DEST)/help/set; \
+		fi; \
+		for i in *.mod/help/set/*.help; do \
+			$(INSTALL_DATA) $$i $(DEST)/help/set/; \
+		done; \
+	fi
 
 #safety hash
diff -urNPX ../exclude ../eggdrop1.3.orig/src/mod/assoc.mod/Makefile ./src/mod/assoc.mod/Makefile
--- ../eggdrop1.3.orig/src/mod/assoc.mod/Makefile	Thu Oct 14 14:03:43 1999
+++ ./src/mod/assoc.mod/Makefile	Thu Oct 14 14:06:50 1999
@@ -19,7 +19,7 @@
 
 assoc.o: ../module.h ../modvals.h ../../eggdrop.h \
 	../../tandem.h
-	$(CC) $(CFLAGS) -DMAKING_MODS -c assoc.c -o assoc.o
+	$(CC) $(CFLAGS) -DMAKING_MODS -c assoc.c
 
 ../assoc.o: assoc.o
 	@rm -f ../assoc.o
diff -urNPX ../exclude ../eggdrop1.3.orig/src/mod/blowfish.mod/Makefile ./src/mod/blowfish.mod/Makefile
--- ../eggdrop1.3.orig/src/mod/blowfish.mod/Makefile	Thu Oct 14 14:03:43 1999
+++ ./src/mod/blowfish.mod/Makefile	Thu Oct 14 14:06:50 1999
@@ -19,7 +19,7 @@
 
 blowfish.o: ../module.h ../modvals.h ../../eggdrop.h \
 	bf_tab.h blowfish.h
-	$(CC) $(CFLAGS) -DMAKING_MODS -c blowfish.c -o blowfish.o
+	$(CC) $(CFLAGS) -DMAKING_MODS -c blowfish.c
 
 ../blowfish.o: blowfish.o
 	@rm -f ../blowfish.o
diff -urNPX ../exclude ../eggdrop1.3.orig/src/mod/channels.mod/Makefile ./src/mod/channels.mod/Makefile
--- ../eggdrop1.3.orig/src/mod/channels.mod/Makefile	Thu Oct 14 14:03:43 1999
+++ ./src/mod/channels.mod/Makefile	Thu Oct 14 14:06:50 1999
@@ -19,7 +19,7 @@
 
 channels.o: ../module.h ../modvals.h ../../eggdrop.h \
 	cmdschan.c tclchan.c userchan.c channels.h
-	$(CC) $(CFLAGS) -DMAKING_MODS -c channels.c -o channels.o
+	$(CC) $(CFLAGS) -DMAKING_MODS -c channels.c
 
 ../channels.o: channels.o
 	@rm -f ../channels.o
diff -urNPX ../exclude ../eggdrop1.3.orig/src/mod/console.mod/Makefile ./src/mod/console.mod/Makefile
--- ../eggdrop1.3.orig/src/mod/console.mod/Makefile	Thu Oct 14 14:03:43 1999
+++ ./src/mod/console.mod/Makefile	Thu Oct 14 14:06:50 1999
@@ -18,7 +18,7 @@
 	$(STRIP) ../../../console.so
 
 console.o: ../module.h ../modvals.h ../../eggdrop.h
-	$(CC) $(CFLAGS) -DMAKING_MODS -c console.c -o console.o
+	$(CC) $(CFLAGS) -DMAKING_MODS -c console.c
 
 ../console.o: console.o
 	@rm -f ../console.o
diff -urNPX ../exclude ../eggdrop1.3.orig/src/mod/ctcp.mod/Makefile ./src/mod/ctcp.mod/Makefile
--- ../eggdrop1.3.orig/src/mod/ctcp.mod/Makefile	Thu Oct 14 14:03:43 1999
+++ ./src/mod/ctcp.mod/Makefile	Thu Oct 14 14:06:50 1999
@@ -19,7 +19,7 @@
 
 ctcp.o: ../module.h ../modvals.h ../../eggdrop.h \
 	ctcp.h ../server.mod/server.h
-	$(CC) $(CFLAGS) -DMAKING_MODS -c ctcp.c -o ctcp.o
+	$(CC) $(CFLAGS) -DMAKING_MODS -c ctcp.c
 
 ../ctcp.o: ctcp.o
 	@rm -f ../ctcp.o
diff -urNPX ../exclude ../eggdrop1.3.orig/src/mod/filesys.mod/Makefile ./src/mod/filesys.mod/Makefile
--- ../eggdrop1.3.orig/src/mod/filesys.mod/Makefile	Thu Oct 14 14:03:43 1999
+++ ./src/mod/filesys.mod/Makefile	Thu Oct 14 14:06:50 1999
@@ -20,7 +20,7 @@
 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) -DMAKING_MODS -c filesys.c -o filesys.o
+	$(CC) $(CFLAGS) -DMAKING_MODS -c filesys.c
 
 ../filesys.o: filesys.o
 	@rm -f ../filesys.o
diff -urNPX ../exclude ../eggdrop1.3.orig/src/mod/irc.mod/Makefile ./src/mod/irc.mod/Makefile
--- ../eggdrop1.3.orig/src/mod/irc.mod/Makefile	Thu Oct 14 14:03:43 1999
+++ ./src/mod/irc.mod/Makefile	Thu Oct 14 14:06:50 1999
@@ -22,7 +22,7 @@
 	../channels.mod/channels.h ../server.mod/server.h
 
 irc.o: 
-	$(CC) $(CFLAGS) -DMAKING_MODS -c irc.c -o irc.o
+	$(CC) $(CFLAGS) -DMAKING_MODS -c irc.c
 
 ../irc.o: irc.o
 	@rm -f ../irc.o
diff -urNPX ../exclude ../eggdrop1.3.orig/src/mod/notes.mod/Makefile ./src/mod/notes.mod/Makefile
--- ../eggdrop1.3.orig/src/mod/notes.mod/Makefile	Thu Oct 14 14:03:44 1999
+++ ./src/mod/notes.mod/Makefile	Thu Oct 14 14:06:50 1999
@@ -19,7 +19,7 @@
 
 notes.o: ../module.h ../modvals.h ../../eggdrop.h \
 	cmdsnote.c notes.c notes.h ../../tandem.h
-	$(CC) $(CFLAGS) -DMAKING_MODS -c notes.c -o notes.o
+	$(CC) $(CFLAGS) -DMAKING_MODS -c notes.c
 
 ../notes.o: notes.o
 	@rm -f ../notes.o
diff -urNPX ../exclude ../eggdrop1.3.orig/src/mod/seen.mod/Makefile ./src/mod/seen.mod/Makefile
--- ../eggdrop1.3.orig/src/mod/seen.mod/Makefile	Thu Oct 14 14:03:44 1999
+++ ./src/mod/seen.mod/Makefile	Thu Oct 14 14:06:50 1999
@@ -20,7 +20,7 @@
 seen.o: ../module.h ../modvals.h ../../eggdrop.h \
 	seen.c ../channels.mod/channels.h \
 	../../chan.h ../../users.h
-	$(CC) $(CFLAGS) -DMAKING_MODS -c seen.c -o seen.o
+	$(CC) $(CFLAGS) -DMAKING_MODS -c seen.c
 
 ../seen.o: seen.o
 	@rm -f ../seen.o
diff -urNPX ../exclude ../eggdrop1.3.orig/src/mod/server.mod/Makefile ./src/mod/server.mod/Makefile
--- ../eggdrop1.3.orig/src/mod/server.mod/Makefile	Thu Oct 14 14:03:44 1999
+++ ./src/mod/server.mod/Makefile	Thu Oct 14 14:06:50 1999
@@ -19,7 +19,7 @@
 
 server.o: ../module.h ../modvals.h ../../eggdrop.h \
 	cmdsserv.c server.c servmsg.c server.h
-	$(CC) $(CFLAGS) -DMAKING_MODS -c server.c -o server.o
+	$(CC) $(CFLAGS) -DMAKING_MODS -c server.c
 
 ../server.o: server.o
 	@rm -f ../server.o
diff -urNPX ../exclude ../eggdrop1.3.orig/src/mod/share.mod/Makefile ./src/mod/share.mod/Makefile
--- ../eggdrop1.3.orig/src/mod/share.mod/Makefile	Thu Oct 14 14:03:44 1999
+++ ./src/mod/share.mod/Makefile	Thu Oct 14 14:06:50 1999
@@ -20,7 +20,7 @@
 share.o: ../module.h ../modvals.h ../../eggdrop.h \
 	share.c ../../chan.h ../../users.h \
 	../channels.mod/channels.h ../transfer.mod/transfer.h
-	$(CC) $(CFLAGS) -DMAKING_MODS -c share.c -o share.o
+	$(CC) $(CFLAGS) -DMAKING_MODS -c share.c
 
 ../share.o: share.o
 	@rm -f ../share.o
diff -urNPX ../exclude ../eggdrop1.3.orig/src/mod/transfer.mod/Makefile ./src/mod/transfer.mod/Makefile
--- ../eggdrop1.3.orig/src/mod/transfer.mod/Makefile	Thu Oct 14 14:03:44 1999
+++ ./src/mod/transfer.mod/Makefile	Thu Oct 14 14:06:50 1999
@@ -19,7 +19,7 @@
 
 transfer.o: ../module.h ../modvals.h ../../eggdrop.h \
 	transfer.h ../../tandem.h ../../users.h
-	$(CC) $(CFLAGS) -DMAKING_MODS -c transfer.c -o transfer.o
+	$(CC) $(CFLAGS) -DMAKING_MODS -c transfer.c
 
 ../transfer.o: transfer.o
 	@rm -f ../transfer.o
diff -urNPX ../exclude ../eggdrop1.3.orig/src/mod/wire.mod/Makefile ./src/mod/wire.mod/Makefile
--- ../eggdrop1.3.orig/src/mod/wire.mod/Makefile	Thu Oct 14 14:03:44 1999
+++ ./src/mod/wire.mod/Makefile	Thu Oct 14 14:06:50 1999
@@ -19,7 +19,7 @@
 
 wire.o: ../module.h ../modvals.h ../../eggdrop.h \
 	wire.c wire.h ../../chan.h ../../users.h
-	$(CC) $(CFLAGS) -DMAKING_MODS -c wire.c -o wire.o
+	$(CC) $(CFLAGS) -DMAKING_MODS -c wire.c
 
 ../wire.o: wire.o
 	@rm -f ../wire.o
diff -urNPX ../exclude ../eggdrop1.3.orig/src/mod/woobie.mod/Makefile ./src/mod/woobie.mod/Makefile
--- ../eggdrop1.3.orig/src/mod/woobie.mod/Makefile	Thu Oct 14 14:03:44 1999
+++ ./src/mod/woobie.mod/Makefile	Thu Oct 14 14:06:50 1999
@@ -18,7 +18,7 @@
 	$(STRIP) ../../../woobie.so
 
 woobie.o: ../module.h ../modvals.h ../../eggdrop.h
-	$(CC) $(CFLAGS) -DMAKING_MODS -c woobie.c -o woobie.o
+	$(CC) $(CFLAGS) -DMAKING_MODS -c woobie.c
 
 ../woobie.o: woobie.o
 	@rm -f ../woobie.o


More information about the Patches mailing list