Explorar el Código

* Fixed a bug with dns.mod

svn: 612
Bryan Drewery hace 22 años
padre
commit
0520405f7d
Se han modificado 2 ficheros con 34 adiciones y 22 borrados
  1. 31 20
      src/Makefile.in
  2. 3 2
      src/mod/dns.mod/Makefile.in

+ 31 - 20
src/Makefile.in

@@ -14,14 +14,37 @@ STRIP = @STRIP@
 CFLAGS = @CFLAGS@ -I.. -I$(top_srcdir) -I$(top_srcdir)/pack @DEFS@ $(CFLGS)
 CPPFLAGS = @CPPFLAGS@
 
-eggdrop_objs = auth.o bg.o botcmd.o botmsg.o botnet.o \
-chanprog.o cmds.o config.o core_binds.o crypt.o dcc.o dccutil.o debug.o \
-dns.o egg_timer.o flags.o main.o mem.o misc.o misc_file.o modules.o net.o \
-rfc1459.o settings.o tcl.o tclhash.o \
-userent.o userrec.o users.o
-
-MAKE_GENERIC = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CC)' 'LD=$(LD)' \
-'STRIP=$(STRIP)' 'CFLGS=$(CFLGS)'
+eggdrop_objs 		= auth.o \
+			bg.o \
+			botcmd.o \
+			botmsg.o \
+			botnet.o \
+			chanprog.o \
+			cmds.o \
+			config.o \
+			core_binds.o \
+			crypt.o \
+			dcc.o \
+			dccutil.o \
+			debug.o \
+			dns.o \
+			egg_timer.o \
+			flags.o \
+			main.o \
+			mem.o \
+			misc.o \
+			misc_file.o \
+			modules.o \
+			net.o \
+			rfc1459.o \
+			settings.o \
+			tcl.o \
+			tclhash.o \
+			userent.o \
+			userrec.o \
+			users.o
+
+MAKE_GENERIC = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CC)' 'LD=$(LD)' 'STRIP=$(STRIP)' 'CFLGS=$(CFLGS)'
 
 blah:
 	@echo ""
@@ -68,12 +91,6 @@ build_msg:
 	@echo "[*] Compiling core components"
 
 
-main.o: stringfix
-	@echo -e "Compiling: \033[1mmain\033[0m"
-	@./stringfix main.c _main.c || cp -f main.c _main.c
-	@$(CC) $(CFLAGS) -I$(top_srcdir) $(CPPFLAGS) '-DCCFLAGS="$(CC) $(CFLAGS) $(CPPFLAGS)"' \
-	'-DLDFLAGS="$(LD)"' '-DSTRIPFLAGS="$(STRIP)"' -c $(srcdir)/_main.c -o main.o
-
 compatability:
 	+@cd compat && $(MAKE_GENERIC) compat
 	@echo "---------- Yeah! that's the compiling, now the linking! ----------"
@@ -92,14 +109,8 @@ include ./.deps/includes
 	@./stringfix $< _$< || cp -f $< _$<
 	@source='$<' object='$@' depfile='.deps/$*.Po' tmpdepfile='.deps/$*.TPo' depmode=gcc3 $(depcomp) \
 	$(CC) $(CFLAGS) $(CPPFLAGS) -c _$<  -o `basename $< .c`.o
-
 #        $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
 
 
-# source='xmlwrite.c' object='xmlwrite.lo' libtool=yes \
-# depfile='.deps/xmlwrite.Plo' tmpdepfile='.deps/xmlwrite.TPlo' \
-# depmode=gcc3 /bin/sh ../../acconfig/depcomp \
-
-
 #safety hash
 

+ 3 - 2
src/mod/dns.mod/Makefile.in

@@ -3,7 +3,7 @@
 RESLIB = @RESLIB@
 RESINCLUDE = @RESINCLUDE@
 srcdir = .
-
+depcomp = /bin/sh ../../../autotools/depcomp
 
 doofus:
 	@echo ""
@@ -16,7 +16,8 @@ static: ../dns.o
 
 ../dns.o:
 	@echo -e "Compiling: \033[1mdns\033[0m"
-	@$(CC) $(CFLAGS) $(CPPFLAGS) $(RESINCLUDE) -DMAKING_MODS -c -MT ../dns.o -MD -MP -MF $(srcdir)/.deps/dns.Po $(srcdir)/dns.c
+	 @source='dns.c' object='$@' depfile='.deps/dns.Po' tmpdepfile='.deps/dns.TPo' depmode=gcc3 $(depcomp) \
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(RESINCLUDE) -DMAKING_MODS -c $(srcdir)/dns.c
 	@rm -f ../dns.o
 	@mv dns.o ../