Últimos retoques.

[z.facultad/75.42/calculadora.git] / Makefile

diff --git a/Makefile b/Makefile
index 831f9a7922b0e269356a85370d9d97934b0c174e..6fb57f72ad2ae54fa4d8b76873611c1bf90c8b6a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -18,25 +18,39 @@ CFLAGS=-ansi -pedantic -Wall -g3 -DDEBUG
 CC=gcc-3.2
 
 # Pruebas.
-TESTS=dllist_test memdebug_test parser_equation_test
+TESTS=dllist_test memdebug_test parser_equation_test parser_variable_test \
+      parser_expression_test
 # Programa a compilar.
-TARGETS=$(TESTS)
+TARGETS=$(TESTS) tp2
 
 # Regla por defecto.
-all: tp1
+all: $(TARGETS)
 
 # Pruebas.
 tests: $(TESTS)
        ./dllist_test
        ./memdebug_test
+       ./parser_equation_test 'a = 40'
+       ./parser_variable_test 'a 40 -50 0.11'
+       ./parser_expression_test '(3 + (-a)) * 2'
 
 dllist_test: dllist.o
 
 memdebug_test: dllist.o meminfo.o memdebug.o
 
-parser_equation_test: dllist.o parseerror.o equation.o parser_equation.o meminfo.o memdebug.o
+parser_equation_test: dllist.o strutil.o meminfo.o memdebug.o parseerror.o \
+       parser_common.o equation.o equation_list.o variable.o variable_list.o \
+       parser_equation.o parser_expression.o
 
-tp1: $(TARGETS)
+parser_variable_test: dllist.o strutil.o meminfo.o memdebug.o parseerror.o \
+       parser_common.o variable.o variable_list.o parser_variable.o
+
+parser_expression_test: dllist.o strutil.o meminfo.o memdebug.o parseerror.o \
+       parser_common.o variable.o variable_list.o parser_expression.o
+
+tp2: dllist.o strutil.o meminfo.o memdebug.o parseerror.o parser_common.o \
+       variable.o variable_list.o parser_expression.o variable_list.o \
+       parser_variable.o equation.o equation_list.o parser_equation.o
 
 # Regla para borrar.
 clean: