simlyfy

build-qt/core/Makefile

@@ -49,14 +49,16 @@ OBJECTS_DIR   = ./
 
 ####### Files
 
-SOURCES       = ../../core/decode_database.cpp \
+SOURCES       = ../../core/dbc_attributes.cpp \
+		../../core/decode_database.cpp \
 		../../core/dbc_decode_builder.cpp \
 		../../core/dbc_decoder.cpp \
 		../../core/dbc_parser.cpp \
 		../../core/dbc_statement_handler.cpp \
 		../../core/dbc_tree_builder.cpp \
 		../../core/tree_node.cpp 
-OBJECTS       = decode_database.o \
+OBJECTS       = dbc_attributes.o \
+		decode_database.o \
 		dbc_decode_builder.o \
 		dbc_decoder.o \
 		dbc_parser.o \
@@ -260,7 +262,9 @@ DIST          = /usr/lib/x86_64-linux-gnu/qt6/mkspecs/features/spec_pre.prf \
 		/usr/lib/x86_64-linux-gnu/qt6/mkspecs/features/exceptions.prf \
 		/usr/lib/x86_64-linux-gnu/qt6/mkspecs/features/yacc.prf \
 		/usr/lib/x86_64-linux-gnu/qt6/mkspecs/features/lex.prf \
-		../../../core/core.pro /home/deeaitch/work/3.projects/git.himro.ca/automotive/dbc/core/signal_layout.h \
+		../../../core/core.pro /home/deeaitch/work/3.projects/git.himro.ca/automotive/dbc/core/attributes.h \
+		/home/deeaitch/work/3.projects/git.himro.ca/automotive/dbc/core/j1939.h \
+		/home/deeaitch/work/3.projects/git.himro.ca/automotive/dbc/core/signal_layout.h \
 		/home/deeaitch/work/3.projects/git.himro.ca/automotive/dbc/core/definition_key.h \
 		/home/deeaitch/work/3.projects/git.himro.ca/automotive/dbc/core/dbc_diagnostic.h \
 		/home/deeaitch/work/3.projects/git.himro.ca/automotive/dbc/core/multiplexing.h \
@@ -276,7 +280,8 @@ DIST          = /usr/lib/x86_64-linux-gnu/qt6/mkspecs/features/spec_pre.prf \
 		/home/deeaitch/work/3.projects/git.himro.ca/automotive/dbc/core/value_descriptions.h \
 		/home/deeaitch/work/3.projects/git.himro.ca/automotive/dbc/core/tree_node.h \
 		/home/deeaitch/work/3.projects/git.himro.ca/automotive/dbc/core/text_utils.h \
-		/home/deeaitch/work/3.projects/git.himro.ca/automotive/dbc/core/typefactory.h ../../core/decode_database.cpp \
+		/home/deeaitch/work/3.projects/git.himro.ca/automotive/dbc/core/typefactory.h ../../core/dbc_attributes.cpp \
+		../../core/decode_database.cpp \
 		../../core/dbc_decode_builder.cpp \
 		../../core/dbc_decoder.cpp \
 		../../core/dbc_parser.cpp \
@@ -737,28 +742,44 @@ compiler_clean:
 
 ####### Compile
 
+dbc_attributes.o: ../../core/dbc_attributes.cpp ../../core/dbc_statement_handler.h \
+		../../core/dbc_database.h \
+		../../core/frame_info.h \
+		../../core/attributes.h \
+		../../core/signal_info.h \
+		../../core/multiplexing.h \
+		../../core/value_descriptions.h \
+		../../core/dbc_diagnostic.h \
+		../../core/typefactory.h
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o dbc_attributes.o ../../core/dbc_attributes.cpp
+
 decode_database.o: ../../core/decode_database.cpp ../../core/decode_database.h \
+		../../core/attributes.h \
 		../../core/definition_key.h \
 		../../core/multiplexing.h \
 		../../core/value_descriptions.h \
+		../../core/j1939.h \
 		../../core/signal_layout.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o decode_database.o ../../core/decode_database.cpp
 
 dbc_decode_builder.o: ../../core/dbc_decode_builder.cpp ../../core/dbc_decode_builder.h \
 		../../core/dbc_database.h \
 		../../core/frame_info.h \
+		../../core/attributes.h \
 		../../core/signal_info.h \
-		../../core/value_descriptions.h \
 		../../core/multiplexing.h \
+		../../core/value_descriptions.h \
 		../../core/decode_database.h \
 		../../core/definition_key.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o dbc_decode_builder.o ../../core/dbc_decode_builder.cpp
 
 dbc_decoder.o: ../../core/dbc_decoder.cpp ../../core/dbc_decoder.h \
 		../../core/decode_database.h \
+		../../core/attributes.h \
 		../../core/definition_key.h \
 		../../core/multiplexing.h \
 		../../core/value_descriptions.h \
+		../../core/j1939.h \
 		../../core/signal_layout.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o dbc_decoder.o ../../core/dbc_decoder.cpp
 
@@ -766,9 +787,10 @@ dbc_parser.o: ../../core/dbc_parser.cpp ../../core/dbc_parser.h \
 		../../core/dbc_diagnostic.h \
 		../../core/dbc_database.h \
 		../../core/frame_info.h \
+		../../core/attributes.h \
 		../../core/signal_info.h \
-		../../core/value_descriptions.h \
 		../../core/multiplexing.h \
+		../../core/value_descriptions.h \
 		../../core/dbc_statement_handler.h \
 		../../core/typefactory.h \
 		../../core/text_utils.h
@@ -777,11 +799,13 @@ dbc_parser.o: ../../core/dbc_parser.cpp ../../core/dbc_parser.h \
 dbc_statement_handler.o: ../../core/dbc_statement_handler.cpp ../../core/dbc_statement_handler.h \
 		../../core/dbc_database.h \
 		../../core/frame_info.h \
+		../../core/attributes.h \
 		../../core/signal_info.h \
-		../../core/value_descriptions.h \
 		../../core/multiplexing.h \
+		../../core/value_descriptions.h \
 		../../core/dbc_diagnostic.h \
 		../../core/typefactory.h \
+		../../core/j1939.h \
 		../../core/text_utils.h \
 		../../core/signal_layout.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o dbc_statement_handler.o ../../core/dbc_statement_handler.cpp
@@ -789,9 +813,10 @@ dbc_statement_handler.o: ../../core/dbc_statement_handler.cpp ../../core/dbc_sta
 dbc_tree_builder.o: ../../core/dbc_tree_builder.cpp ../../core/dbc_tree_builder.h \
 		../../core/dbc_database.h \
 		../../core/frame_info.h \
+		../../core/attributes.h \
 		../../core/signal_info.h \
-		../../core/value_descriptions.h \
 		../../core/multiplexing.h \
+		../../core/value_descriptions.h \
 		../../core/tree_node.h \
 		../../core/definition_key.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o dbc_tree_builder.o ../../core/dbc_tree_builder.cpp
@@ -799,9 +824,10 @@ dbc_tree_builder.o: ../../core/dbc_tree_builder.cpp ../../core/dbc_tree_builder.
 tree_node.o: ../../core/tree_node.cpp ../../core/tree_node.h \
 		../../core/definition_key.h \
 		../../core/frame_info.h \
+		../../core/attributes.h \
 		../../core/signal_info.h \
-		../../core/value_descriptions.h \
-		../../core/multiplexing.h
+		../../core/multiplexing.h \
+		../../core/value_descriptions.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o tree_node.o ../../core/tree_node.cpp
 
 ####### Install