[prettyprint] r592 committed - Makefile cleanup
prett...@googlecode.com
Author: thockin
Date: Tue Dec 14 18:26:24 2010
Log: Makefile cleanup
http://code.google.com/p/prettyprint/source/detail?r=592
Modified:
/trunk/Make.module
/trunk/Makefile
/trunk/devices/Make.module
/trunk/drivers/Make.module
/trunk/drivers/cpuid/Make.module
/trunk/drivers/io/Make.module
/trunk/drivers/mem/Make.module
/trunk/drivers/msr/Make.module
/trunk/drivers/pci/Make.module
/trunk/examples/Make.module
/trunk/language/Make.module
/trunk/language/grammar.y
/trunk/util/Make.module
=======================================
--- /trunk/Make.module Fri Apr 23 20:52:25 2010
+++ /trunk/Make.module Tue Dec 14 18:26:24 2010
@@ -1,24 +1,24 @@
SRCS += fake_language.cpp \
- runtime.cpp \
- language.cpp \
- magic_regs.cpp \
- drivers.cpp \
- path.cpp \
- scope.cpp \
- version.cpp
+ runtime.cpp \
+ language.cpp \
+ magic_regs.cpp \
+ drivers.cpp \
+ path.cpp \
+ scope.cpp \
+ version.cpp
TESTS += tests/path_test \
- tests/dirent_test \
- tests/binding_test \
- tests/register_test \
- tests/regbits_test \
- tests/datatype_test \
- tests/field_test \
- tests/scope_test \
- tests/array_test \
- tests/alias_test \
- tests/fake_language_test \
- tests/magic_regs_test
+ tests/dirent_test \
+ tests/binding_test \
+ tests/register_test \
+ tests/regbits_test \
+ tests/datatype_test \
+ tests/field_test \
+ tests/scope_test \
+ tests/array_test \
+ tests/alias_test \
+ tests/fake_language_test \
+ tests/magic_regs_test
tests/path_test: path.o
tests/dirent_test:
=======================================
--- /trunk/Makefile Wed Jun 2 08:46:07 2010
+++ /trunk/Makefile Tue Dec 14 18:26:24 2010
@@ -11,6 +11,7 @@
# This is a private helper for IMPORT_MODULE.
define _IMPORT_MODULE
+ DIR := $(1)
include $(1)/Make.module
endef
# Import a sub-module's make targets.
=======================================
--- /trunk/devices/Make.module Fri Apr 23 20:52:25 2010
+++ /trunk/devices/Make.module Tue Dec 14 18:26:24 2010
@@ -1,15 +1,14 @@
OBJS += devices/all_devices.o
-MODULE_SRCS := \
- devices/global.cpp \
- devices/pci/pci.cpp \
- devices/pci/generic_device.cpp \
- devices/cpu/cpu.cpp \
- devices/cpuid/cpuid.cpp \
- devices/cpuid/generic_device.cpp \
- devices/msr/msr.cpp \
- devices/msr/generic_device.cpp \
- devices/amd/k8.cpp
+MODULE_SRCS := devices/global.cpp \
+ devices/pci/pci.cpp \
+ devices/pci/generic_device.cpp \
+ devices/cpu/cpu.cpp \
+ devices/cpuid/cpuid.cpp \
+ devices/cpuid/generic_device.cpp \
+ devices/msr/msr.cpp \
+ devices/msr/generic_device.cpp \
+ devices/amd/k8.cpp
MODULE_OBJS := $(MODULE_SRCS:.cpp=.o)
CLEANS += $(MODULE_OBJS)
=======================================
--- /trunk/drivers/Make.module Fri Apr 23 20:52:25 2010
+++ /trunk/drivers/Make.module Tue Dec 14 18:26:24 2010
@@ -23,6 +23,5 @@
DRIVER_INIT_FUNCS = $(foreach d,$(ALL_DRIVERS), \
load_$(d)_driver, \
)
-drivers/all_drivers.o: DEFS += \
- -DDRIVER_INIT_FUNCS="$(DRIVER_INIT_FUNCS)" \
- -DDRIVER_INIT_PROTOS="$(DRIVER_INIT_PROTOS)"
+drivers/all_drivers.o: DEFS += -DDRIVER_INIT_FUNCS="$(DRIVER_INIT_FUNCS)" \
+ -DDRIVER_INIT_PROTOS="$(DRIVER_INIT_PROTOS)"
=======================================
--- /trunk/drivers/cpuid/Make.module Fri Apr 23 20:52:25 2010
+++ /trunk/drivers/cpuid/Make.module Tue Dec 14 18:26:24 2010
@@ -1,5 +1,5 @@
SRCS += drivers/cpuid/cpuid_driver.cpp \
- drivers/cpuid/cpuid_binding.cpp
+ drivers/cpuid/cpuid_binding.cpp
TESTS += drivers/cpuid/tests/cpuid_io_test
=======================================
--- /trunk/drivers/io/Make.module Fri Apr 23 20:52:25 2010
+++ /trunk/drivers/io/Make.module Tue Dec 14 18:26:24 2010
@@ -1,5 +1,5 @@
SRCS += drivers/io/io_driver.cpp \
- drivers/io/io_binding.cpp
+ drivers/io/io_binding.cpp
TESTS += drivers/io/tests/io_io_test
=======================================
--- /trunk/drivers/mem/Make.module Fri Apr 23 20:52:25 2010
+++ /trunk/drivers/mem/Make.module Tue Dec 14 18:26:24 2010
@@ -1,5 +1,5 @@
SRCS += drivers/mem/mem_driver.cpp \
- drivers/mem/mem_binding.cpp
+ drivers/mem/mem_binding.cpp
TESTS += drivers/mem/tests/mem_io_test
=======================================
--- /trunk/drivers/msr/Make.module Fri Apr 23 20:52:25 2010
+++ /trunk/drivers/msr/Make.module Tue Dec 14 18:26:24 2010
@@ -1,5 +1,5 @@
SRCS += drivers/msr/msr_driver.cpp \
- drivers/msr/msr_binding.cpp
+ drivers/msr/msr_binding.cpp
TESTS += drivers/msr/tests/msr_io_test
=======================================
--- /trunk/drivers/pci/Make.module Fri Apr 23 20:52:25 2010
+++ /trunk/drivers/pci/Make.module Tue Dec 14 18:26:24 2010
@@ -1,5 +1,5 @@
SRCS += drivers/pci/pci_driver.cpp \
- drivers/pci/pci_binding.cpp
+ drivers/pci/pci_binding.cpp
TESTS += drivers/pci/tests/pci_io_test
=======================================
--- /trunk/examples/Make.module Fri Apr 23 20:52:25 2010
+++ /trunk/examples/Make.module Tue Dec 14 18:26:24 2010
@@ -1,10 +1,9 @@
-MODULE_BINS := \
- examples/pp_discover \
- examples/pp_pci \
- examples/pp_read \
- examples/pp_fuse \
- examples/pp_server \
- examples/pp_client
+MODULE_BINS := examples/pp_discover \
+ examples/pp_pci \
+ examples/pp_read \
+ examples/pp_fuse \
+ examples/pp_server \
+ examples/pp_client
BINS += $(MODULE_BINS)
CLEANS += examples/cmdline.o
=======================================
--- /trunk/language/Make.module Thu Jul 8 08:05:06 2010
+++ /trunk/language/Make.module Tue Dec 14 18:26:24 2010
@@ -1,45 +1,49 @@
SRCS += language/environment.cpp \
- language/language.cpp \
- language/syntax_tree.cpp \
- language/type.cpp \
- language/variable.cpp \
- language/auto.lex.cpp \
- language/auto.yacc.cpp
+ language/language.cpp \
+ language/syntax_tree.cpp \
+ language/type.cpp \
+ language/variable.cpp \
+ language/auto.lex.cpp \
+ language/auto.yacc.cpp
BINS += language/parse_stdin
CLEANS += language/auto.*
TESTS += language/tests/type_test \
- language/tests/variable_test \
- language/tests/syntax_tree_test \
- language/tests/language_test
+ language/tests/variable_test \
+ language/tests/syntax_tree_test
+ #language/tests/language_test
language/language.o: language/auto.lex.h language/auto.yacc.h
-language/auto.lex.cpp language/auto.lex.h: language/grammar.l
+language/auto.lex.cpp \
+language/auto.lex.h: language/grammar.l
$(LEX) -o language/auto.lex.cpp --header-file=language/auto.lex.h $<
language/auto.lex.o: CWARNS += -Wno-unused -Wno-sign-compare
-language/auto.yacc.cpp language/auto.yacc.h: language/grammar.y
+language/auto.yacc.cpp \
+language/auto.yacc.h: language/grammar.y
$(YACC) -o language/auto.yacc.cpp --defines=language/auto.yacc.h $<
language/auto.yacc.o: CXXWARNS += -Wno-write-strings
language/tests/variable_test: language/variable.o language/type.o
+
language/tests/type_test: language/type.o
+
language/tests/syntax_tree_test: language/syntax_tree.o \
- language/auto.lex.o \
- language/auto.yacc.o \
- language/environment.o \
- language/language.o \
- language/type.o \
- language/variable.o
-language/tests/parse_and_validate_test: \
- language/auto.lex.o \
- language/auto.yacc.o \
- language/environment.o \
- language/language.o \
- language/syntax_tree.o \
- language/type.o \
- language/variable.o
-
+ language/auto.lex.o \
+ language/auto.yacc.o \
+ language/environment.o \
+ language/language.o \
+ language/type.o \
+ language/variable.o
+
+language/tests/parse_and_validate_test: language/auto.lex.o \
+ language/auto.yacc.o \
+ language/environment.o \
+ language/language.o \
+ language/syntax_tree.o \
+ language/type.o \
+ language/variable.o
+
=======================================
--- /trunk/language/grammar.y Mon Dec 13 16:05:48 2010
+++ /trunk/language/grammar.y Tue Dec 14 18:26:24 2010
@@ -88,12 +88,12 @@
#define DO_SYNTRACE 0
#if DO_SYNTRACE
- // To make tracing the parser easier.
- #define SYNTRACE(left, right) do { \
- fprintf(stderr, "%d: %s <- %s\n", lex_lineno(), left, right); \
- } while (0)
+ // To make tracing the parser easier.
+ #define SYNTRACE(left, right) do { \
+ fprintf(stderr, "%d: %s <- %s\n", lex_lineno(), left, right); \
+ } while (0)
#else
- #define SYNTRACE(left, right)
+ #define SYNTRACE(left, right)
#endif
// To make position tracking less "in your face".
=======================================
--- /trunk/util/Make.module Thu Jun 17 09:26:29 2010
+++ /trunk/util/Make.module Tue Dec 14 18:26:24 2010
@@ -1,13 +1,11 @@
-TESTS += \
- util/tests/bignum_test \
- util/tests/bit_buffer_test \
- util/tests/filesystem_test \
- util/tests/keyed_vector_test \
- util/tests/pointer_test \
- util/tests/printfxx_test \
- util/tests/regex_test \
- util/tests/sockets_test \
- util/tests/symbol_table_test \
- util/tests/syserror_test
-
- #util/tests/shared_object_test
+TESTS += util/tests/bignum_test \
+ util/tests/bit_buffer_test \
+ util/tests/filesystem_test \
+ util/tests/keyed_vector_test \
+ util/tests/pointer_test \
+ util/tests/printfxx_test \
+ util/tests/regex_test \
+ util/tests/sockets_test \
+ util/tests/symbol_table_test \
+ util/tests/syserror_test
+ #util/tests/shared_object_test