Changes between Version 9 and Version 10 of CaoCourseTme2

Timestamp:

Feb 16, 2007, 1:15:49 PM (18 years ago)

Author:

franck

Comment:

--

CaoCourseTme2

@@ -62 +62 @@
 == Le processus de construction : Makefile ==
 
- 1. Completez la liste des dépendances lignes 24 à 28.
+ 1. Completez la liste des dépendances pour les cibles : {{{main.o ... namealloc.o}}}.
  1. Réécrivez les commandes en utilisant les variables automatiques : {{{$@ $< $^}}}
     * {{{$@}}} : désigne la cible d'une règle.
@@ -75 +75 @@
 '''Fichier Makefile'''
 {{{
-  1 # Definition des commandes 
-  2 CC      = gcc 
-  3 AR      = ar 
-  4 RM      = rm 
-  5 INDENT  = indent 
-  6  
-  7 # Definition des parametres 
-  8 LDFLAGS = -p 
-  9 CFLAGS  = -g -p -Wall -ansi -Werror
- 10 ARFLAGS = -r
- 11 IDFLAGS = -gnu  -bli0 -npsl -l90
- 12 
- 13 # Definition de la liste des librairies necesaires a l'edition de lien
- 14 LDLIBS  = -L. -lhte
- 15 
- 16 .PHONY: all clean realclean
- 17 
- 18 stat : main.o count.o libhte.a
- 19         $(CC) $(LDFLAGS) main.o count.o -o stat $(LDLIBS) 
- 20 
- 21 libhte.a : hte.o dico.o dejavu.o namealloc.o
- 22         $(AR) $(ARFLAGS) libhte.a hte.o dico.o dejavu.o namealloc.o 
- 23 
- 24 main.o: 
- 25 count.o:
- 26 hte.o:
- 27 dejavu.o: 
- 28 namealloc.o: 
- 29 
- 30 all: clean stat
- 31 
- 32 clean:
- 33         $(RM) *.o *.a *.out *~ 2> /dev/null || true
- 34 
- 35 realclean: clean
- 36         $(RM) stat 2> /dev/null || true
- 37 
- 38 indent:
- 39         $(INDENT) $(IDFLAGS) *.c *.h
+# Definition des commandes 
+CC      = gcc 
+AR      = ar 
+RM      = rm 
+INDENT  = indent 
+ 
+# Definition des parametres 
+LDFLAGS = -p 
+CFLAGS  = -g -p -Wall -ansi -Werror
+ARFLAGS = -r
+IDFLAGS = -gnu  -bli0 -npsl -l90
+ 
+# Definition de la liste des librairies necesaires a l'edition de lien
+LDLIBS  = -L. -lhte
+}}}
+{{{
+.PHONY: all clean realclean
+ 
+stat : main.o count.o libhte.a
+        $(CC) $(LDFLAGS) main.o count.o -o stat $(LDLIBS) 
+
+libhte.a : hte.o dico.o dejavu.o namealloc.o
+        $(AR) $(ARFLAGS) libhte.a hte.o dico.o dejavu.o namealloc.o 
+
+main.o: 
+count.o:
+hte.o:
+dejavu.o: 
+namealloc.o: 
+ 
+all: clean stat
+ 
+clean:
+        $(RM) *.o *.a *.out *~ 2> /dev/null || true
+
+realclean: clean
+        $(RM) stat 2> /dev/null || true
+
+indent:
+        $(INDENT) $(IDFLAGS) *.c *.h
 }}}
 
@@ -155 +156 @@
 '''Fichier main.c'''
 {{{
-  1 #include <stdlib.h>
-  2 #include <stdio.h>
-  3 #include <getopt.h>
-  4 #include "main.h"
-  5 #include "count.h"
-  6 #include "hte.h"
-  7 
-  8 struct mainarg_s MAINARG;
-  9 
- 10 void usage (char *command)
- 11 {
- 12     printf ("\nStatistique Diverses\n");
- 13     printf ("Usage  : %s 
- 14             [-v] [-o OutFile] InFile\n", command);
- 15     printf ("-v          verbose mode\n");
- 16     printf ("-o OutFile  output file (stdout by default)\n\n");
- 17     exit (EXIT_FAILURE);
- 18 }
- 19 
- 20 void getarg (int argc, char **argv)
- 21 {
- 22     extern char *optarg;
- 23     extern int optind;
- 24     char option;
- 25 
- 26     MAINARG.OUTPUTFILE = NULL;
- 27     while ((option = getopt (argc, argv, "vo:")) != EOF)
- 28         switch (option)
- 29         {
- 30         case 'v':
- 31             MAINARG.VERBOSE = 1;
- 32             fprintf (stderr, "Verbose mode\n");
- 33             break;
- 34 
- 35         case 'o':
- 36             if (MAINARG.VERBOSE)
- 37                 fprintf (stderr, "Fichier de sortie : %s\n", optarg);
- 38 
- 39             MAINARG.OUTPUTFILE = fopen (optarg, "w");
- 40             if (MAINARG.OUTPUTFILE == NULL)
- 41             {
- 42                 fprintf (stderr, "%s: %s: \n", argv[0], optarg);
- 43                 perror ("fopen");
- 44                 exit (EXIT_FAILURE);
- 45             }
- 46             break;
- 47 
- 48         case '?':
- 49         default:
- 50             usage (argv[0]);
- 51         }
- 52     if ((optind + 1) != argc)
- 53     {
- 54         usage (argv[0]);
- 55     }
- 56     else
- 57     {
- 58         if (MAINARG.VERBOSE)
- 59             fprintf (stderr, "Fichier d'entrée : %s\n", argv[optind]);
- 60 
- 61         MAINARG.INFILE = fopen (argv[optind], "r");
- 62         if (MAINARG.INFILE == NULL)
- 63         {
- 64             fprintf (stderr, "%s: %s ", argv[0], argv[optind]);
- 65             perror ("fopen");
- 66             exit (EXIT_FAILURE);
- 67         }
- 68         if (MAINARG.OUTPUTFILE == NULL)
- 69             MAINARG.OUTPUTFILE = stdout;
- 70     }
- 71 }
- 72 
- 73 int main (int argc, char **argv)
- 74 {
- 75     getarg (argc, argv);
- 76     count (MAINARG.INFILE);
- 77     fclose (MAINARG.OUTPUTFILE);
- 78     return EXIT_SUCCESS;
- 79 }
+include <stdlib.h>
+#include <stdio.h>
+#include <getopt.h>
+#include "main.h"
+#include "count.h"
+#include "hte.h"
+}}}
+{{{
+struct mainarg_s MAINARG;
+}}}
+{{{
+void usage (char *command)
+{
+    printf ("\nStatistique Diverses\n");
+    printf ("Usage  : %s 
+            [-v] [-o OutFile] InFile\n", command);
+    printf ("-v          verbose mode\n");
+    printf ("-o OutFile  output file (stdout by default)\n\n");
+    exit (EXIT_FAILURE);
+}
+}}}
+{{{
+void getarg (int argc, char **argv)
+{
+    extern char *optarg;
+    extern int optind;
+    char option;
+
+    MAINARG.OUTPUTFILE = NULL;
+    while ((option = getopt (argc, argv, "vo:")) != EOF)
+        switch (option)
+        {
+        case 'v':
+            MAINARG.VERBOSE = 1;
+            fprintf (stderr, "Verbose mode\n");
+            break;
+
+        case 'o':
+            if (MAINARG.VERBOSE)
+                fprintf (stderr, "Fichier de sortie : %s\n", optarg);
+
+            MAINARG.OUTPUTFILE = fopen (optarg, "w");
+            if (MAINARG.OUTPUTFILE == NULL)
+            {
+                fprintf (stderr, "%s: %s: \n", argv[0], optarg);
+                perror ("fopen");
+                exit (EXIT_FAILURE);
+            }
+            break;
+
+        case '?':
+        default:
+            usage (argv[0]);
+        }
+    if ((optind + 1) != argc)
+    {   
+        usage (argv[0]);
+    }   
+    else
+    {   
+        if (MAINARG.VERBOSE)
+            fprintf (stderr, "Fichier d'entrée : %s\n", argv[optind]);
+
+        MAINARG.INFILE = fopen (argv[optind], "r");
+        if (MAINARG.INFILE == NULL)
+        {
+            fprintf (stderr, "%s: %s ", argv[0], argv[optind]);
+            perror ("fopen");
+            exit (EXIT_FAILURE);
+        }
+        if (MAINARG.OUTPUTFILE == NULL)
+            MAINARG.OUTPUTFILE = stdout;
+    }   
+}
+}}}
+{{{
+int main (int argc, char **argv)
+{
+    getarg (argc, argv);
+    count (MAINARG.INFILE);
+    fclose (MAINARG.OUTPUTFILE);
+    return EXIT_SUCCESS;
+}
 }}}