[Anet-checkins] CVS: ANet/ANet_Daemon/Linux Makefile,1.3,1.4 Makefile.in,1.1,1.2 build_exclusion.txt,1.1,1.2 build_locations.txt,1.1,1.2 build_makefile.pl,1.1,1.2

[Benoit N. <be...@us...>]

Update of /cvsroot/anet/ANet/ANet_Daemon/Linux
In directory usw-pr-cvs1:/tmp/cvs-serv16291/ANet_Daemon/Linux

Modified Files:
	Makefile Makefile.in build_exclusion.txt build_locations.txt 
	build_makefile.pl 
Log Message:
Built Makefile generator

Index: Makefile
===================================================================
RCS file: /cvsroot/anet/ANet/ANet_Daemon/Linux/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile	2001/11/15 19:33:07	1.3
--- Makefile	2001/11/17 00:06:25	1.4
***************
*** 1,53 ****
  SHELL = /bin/sh
  
! # Add paths to all the headers here.
! header_paths = -I. -I../Common -I../Core -I../Common/Lists
! 
! # Change compiler options here
! compiler = gcc -g ${header_paths} -Wall
  
! # Add source and header files paths here
! vpath %.c .
! vpath %.c ../Common/
! vpath %.c ../Common/Lists/
! vpath %.c ../Core/
! vpath %.h .
! vpath %.h ../Common/
! vpath %.h ../Common/Lists/
! vpath %.h ../Core/
  
! # Default rule to compile *.c files.
! %.o: %.c
! 	${compiler} -c $< -o $@
  
! # Linking target
! anetd: DoubleLinkedLists.o LinkedLists.o BinaryTrees.o Memory.o main.o
! 	${compiler} $^ -lm -o anetd
  
! # Add files to compile here.
! # Append file-specific header after the *.c files
! DoubleLinkedLists.o: DoubleLinkedLists.c LinkedLists.h
! LinkedLists.o: LinkedLists.c LinkedLists.h
! BinaryTrees.o: BinaryTrees.c LinkedLists.h
! Memory.o: Memory.c Memory.h
! main.o: main.c Modules.h
  
! # Header dependencies. Neat, no?
! Modules.h: Memory.h Packets.h XMLCommon.h LinkedLists.h
! 	@touch ../Common/Modules.h
! Packets.h: Memory.h
! 	@touch ../Common/Memory.h
! XMLCommon.h: Memory.h
! 	@touch ../Common/XMLCommon.h
! LinkedLists.h: ANetCommon.h
! 	@touch ../Common/Lists/LinkedLists.h
! Memory.h: ANetCommon.h
! 	@touch ../Common/Memory.h
  
- # Special targets below.
- all: test
- clean: build_clean
- 	rm -f anetd
- build_clean:
- 	rm -f *.o
- .PHONY: all clean build_clean
\ No newline at end of file
--- 1,27 ----
  SHELL = /bin/sh
  
! all: build
  
! Makefile_real.out:
! 	perl build_makefile.pl > Makefile.in2
! 	cat Makefile.in Makefile.in2 > Makefile_real.out
! 	rm -f Makefile.in2
  
! build: Makefile_real.out
! 	@$(MAKE) -f Makefile_real.out
  
! clean:
! 	rm -f anetd
! 	rm -f *.o
! 	rm -f Makefile.in2
! 	rm -f Makefile_real.out
  
! rebuild:
! 	rm -f Makefile.out
! 	perl build_makefile.pl > Makefile.in2
! 	cat Makefile.in Makefile.in2 > Makefile_real.out
! 	rm -f Makefile.in2
! 	@$(MAKE) -f Makefile_real.out
  
! .PHONY: all build clean rebuild
  

Index: Makefile.in
===================================================================
RCS file: /cvsroot/anet/ANet/ANet_Daemon/Linux/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile.in	2001/11/16 02:45:18	1.1
--- Makefile.in	2001/11/17 00:06:25	1.2
***************
*** 7,10 ****
--- 7,13 ----
  compiler = gcc -g ${header_paths} -Wall
  
+ # Change linker options here
+ linker = gcc -lm
+ 
  # Add source and header files paths here
  vpath %.c .

Index: build_exclusion.txt
===================================================================
RCS file: /cvsroot/anet/ANet/ANet_Daemon/Linux/build_exclusion.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** build_exclusion.txt	2001/11/16 02:45:18	1.1
--- build_exclusion.txt	2001/11/17 00:06:25	1.2
***************
*** 3,5 ****
  StubModule.c
  ModuleLoader.c
- 
--- 3,4 ----

Index: build_locations.txt
===================================================================
RCS file: /cvsroot/anet/ANet/ANet_Daemon/Linux/build_locations.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** build_locations.txt	2001/11/16 02:45:18	1.1
--- build_locations.txt	2001/11/17 00:06:25	1.2
***************
*** 2,4 ****
  ../Common
  ../Common/Lists
! ../Core
--- 2,4 ----
  ../Common
  ../Common/Lists
! ../Core
\ No newline at end of file

Index: build_makefile.pl
===================================================================
RCS file: /cvsroot/anet/ANet/ANet_Daemon/Linux/build_makefile.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** build_makefile.pl	2001/11/16 02:45:18	1.1
--- build_makefile.pl	2001/11/17 00:06:25	1.2
***************
*** 1,4 ****
--- 1,8 ----
  #!/usr/bin/perl
  
+ # Makefile generator for the ANet project.
+ # By Benad.
+ # Distributed under GPL.
+ 
  use strict;
  
***************
*** 9,22 ****
  sub main()
  {
-     if ($ARGV[0] eq '--help')
-     {
- 	print "help info...\n";
- 	return;
-     }
      my @fileExclusionList;
      open(EXCLUSION, 'build_exclusion.txt');
      while (<EXCLUSION>)
      {
! 	chop();
  	push(@fileExclusionList, $_);
      }
--- 13,25 ----
  sub main()
  {
      my @fileExclusionList;
      open(EXCLUSION, 'build_exclusion.txt');
      while (<EXCLUSION>)
      {
! 	tr/\n//d;
! 	if ($_ eq '')
! 	{
! 	    next;
! 	}
  	push(@fileExclusionList, $_);
      }
***************
*** 26,30 ****
      while (<DIRLIST>)
      {
! 	chop();
  	opendir(DIR, $_);
  	my @files = readdir(DIR);
--- 29,37 ----
      while (<DIRLIST>)
      {
! 	tr/\n//d;
! 	if ($_ eq '')
! 	{
! 	    next;
! 	}
  	opendir(DIR, $_);
  	my @files = readdir(DIR);
***************
*** 61,65 ****
  	while (<FILE>)
  	{
! 	    chop();
  	    if (/^\#include *\"(.*?)\"/)
  	    {
--- 68,72 ----
  	while (<FILE>)
  	{
! 	    tr/\n//d;
  	    if (/^\#include *\"(.*?)\"/)
  	    {
***************
*** 112,116 ****
      }
      print "\n\t";
!     print '${compiler} $^ -lm -o anetd';
      print "\n";
  }
--- 119,123 ----
      }
      print "\n\t";
!     print '${linker} $^ -o anetd';
      print "\n";
  }