X-Git-Url: https://git.llucax.com/z.facultad/75.42/calculadora.git/blobdiff_plain/0f0090fd999b6194842cbff05ee4f93d69c43000..e08656fb1390508d9310e5964fc1884bae95c2ee:/Makefile

diff --git a/Makefile b/Makefile
index 9b31f15..c9aea06 100644
--- a/Makefile
+++ b/Makefile
@@ -15,32 +15,41 @@
 
 # Opciones para el compilador.
 CFLAGS=-ansi -pedantic -Wall -g3 -DDEBUG
-CC=gcc-3.2
 
 # Pruebas.
-TESTS=dllist_test memdebug_test parser_equation_test parser_variable_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'
+	./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 strutil.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
 
-parser_variable_test: dllist.o parseerror.o variable.o strutil.o parser_variable.o meminfo.o memdebug.o
+parser_variable_test: dllist.o strutil.o meminfo.o memdebug.o parseerror.o \
+	parser_common.o variable.o variable_list.o parser_variable.o
 
-tp1: $(TARGETS)
+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: