Skip to content

Commit c847717

Browse files
committed
Now all the text tables used to generate .h and .c files
are with the C code generating .c and .h. Moved out of the dwarfdump directory. modified: src/bin/attr_form/Makefile.am renamed: src/bin/dwarfdump/attr_formclass.list -> src/bin/attr_form/attr_formclass.list renamed: src/bin/dwarfdump/attr_formclass_ext.list -> src/bin/attr_form/attr_formclass_ext.list modified: src/bin/dwarfdump/Makefile.am modified: src/bin/tag_attr/Makefile.am renamed: src/bin/dwarfdump/tag_attr.list -> src/bin/tag_attr/tag_attr.list renamed: src/bin/dwarfdump/tag_attr_ext.list -> src/bin/tag_attr/tag_attr_ext.list modified: src/bin/tag_tree/Makefile.am renamed: src/bin/dwarfdump/dd_tag_common.c -> src/bin/tag_tree/tag_common.c renamed: src/bin/dwarfdump/tag_tree.list -> src/bin/tag_tree/tag_tree.list renamed: src/bin/dwarfdump/tag_tree_ext.list -> src/bin/tag_tree/tag_tree_ext.list
1 parent 2c542ea commit c847717

File tree

11 files changed

+22
-19
lines changed

11 files changed

+22
-19
lines changed

src/bin/attr_form/Makefile.am

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
MAINTAINERCLEANFILES = Makefile.in
55
rebuild: attrform
66
rm -f tempaftab
7-
cp $(top_srcdir)/src/bin/dwarfdump/attr_formclass.list af-t1.c
7+
cp $(top_srcdir)/src/bin/attr_form/attr_formclass.list af-t1.c
88
$(CC) -E -I$(top_srcdir)/src/lib/libdwarf af-t1.c >tmp-af-build1.tmp
9-
cp $(top_srcdir)/src/bin/dwarfdump/attr_formclass_ext.list af-t2.c
9+
cp $(top_srcdir)/src/bin/attr_form/attr_formclass_ext.list af-t2.c
1010
$(CC) -E -I$(top_srcdir)/src/lib/libdwarf af-t2.c >tmp-af-build2.tmp
1111
./attrform -s -i tmp-af-build1.tmp -o tempaftab
1212
./attrform -e -i tmp-af-build2.tmp -o tempaftab
@@ -28,7 +28,7 @@ $(top_srcdir)/src/bin/dwarfdump/dd_naming.c \
2828
$(top_srcdir)/src/bin/dwarfdump/dd_glflags.c \
2929
$(top_srcdir)/src/bin/dwarfdump/dd_sanitized.c \
3030
$(top_srcdir)/src/bin/dwarfdump/dd_safe_strcpy.c \
31-
$(top_srcdir)/src/bin/dwarfdump/dd_tag_common.c
31+
$(top_srcdir)/src/bin/tag_tree/tag_common.c
3232
### In the following dwarfdump before libdwarf
3333
### is essential to avoid _dwarf_tsearch link error.
3434
attrform_CPPFLAGS = -DBUILD_NONLIB_SOURCE -DSKIP_AF_CHECK -DTRIVIAL_NAMING \
@@ -37,3 +37,7 @@ attrform_CPPFLAGS = -DBUILD_NONLIB_SOURCE -DSKIP_AF_CHECK -DTRIVIAL_NAMING \
3737
-I$(top_srcdir)/src/lib/libdwarf
3838
attrform_CFLAGS = $(DWARF_CFLAGS_WARN)
3939
attrform_LDADD = $(top_builddir)/src/lib/libdwarf/libdwarf.la
40+
41+
EXTRA_DIST= \
42+
attr_formclass.list \
43+
attr_formclass_ext.list

src/bin/dwarfdump/Makefile.am

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,6 @@ dwarfdumpconf_DATA = dwarfdump.conf
108108

109109
### The tests go elsewhere.
110110
EXTRA_DIST = \
111-
dd_tag_common.c \
112-
dd_uritablebuild.c \
113111
$(man_MANS) \
114112
COPYING \
115113
DWARFDUMPCOPYRIGHT \
@@ -134,12 +132,5 @@ CMakeLists.txt \
134132
NEWS \
135133
README \
136134
CODINGSTYLE \
137-
testdwarfdump.conf \
138135
$(dwarfdumpdev_DATA) \
139-
$(dwarfdumpconf_DATA) \
140-
attr_formclass.list \
141-
attr_formclass_ext.list \
142-
tag_attr.list \
143-
tag_attr_ext.list \
144-
tag_tree.list \
145-
tag_tree_ext.list
136+
$(dwarfdumpconf_DATA)

src/bin/tag_attr/Makefile.am

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33

44
MAINTAINERCLEANFILES = Makefile.in
55
rebuild: tagattr
6-
cp $(top_srcdir)/src/bin/dwarfdump/tag_attr.list tmp-t2.c
6+
cp $(top_srcdir)/src/bin/tag_attr/tag_attr.list tmp-t2.c
77
$(CC) -DTRIVIAL_NAMING -I$(top_srcdir)/src/lib/libdwarf -E tmp-t2.c >tmp-tag-attr-build2.tmp
88
./tagattr -s -i tmp-tag-attr-build2.tmp -o dwarfdump-ta-table.h
99
cp dwarfdump-ta-table.h $(top_srcdir)/src/bin/dwarfdump/
1010
rm -f tmp-tag-attr-build2.tmp
1111
rm -f tmp-t2.c
1212
rm -f tmp-t3.c
13-
cp $(top_srcdir)/src/bin/dwarfdump/tag_attr_ext.list tmp-t3.c
13+
cp $(top_srcdir)/src/bin/tag_attr/tag_attr_ext.list tmp-t3.c
1414
$(CC) -DTRIVIAL_NAMING -I$(top_srcdir)/src/lib/libdwarf -E tmp-t3.c > tmp-tag-attr-build3.tmp
1515
./tagattr -e -i tmp-tag-attr-build3.tmp -o dwarfdump-ta-ext-table.h
1616
cp dwarfdump-ta-ext-table.h $(top_srcdir)/src/bin/dwarfdump/
@@ -26,12 +26,16 @@ $(top_srcdir)/src/bin/dwarfdump/dd_naming.c \
2626
$(top_srcdir)/src/bin/dwarfdump/dd_sanitized.c \
2727
$(top_srcdir)/src/bin/dwarfdump/dd_glflags.c \
2828
$(top_srcdir)/src/bin/dwarfdump/dd_safe_strcpy.c \
29-
$(top_srcdir)/src/bin/dwarfdump/dd_tag_common.c
29+
$(top_srcdir)/src/bin/tag_tree/tag_common.c
3030
tagattr_CPPFLAGS = -DTRIVIAL_NAMING \
3131
-DBUILD_NONLIB_SOURCE \
3232
-I$(top_srcdir)/src/lib/libdwarf \
3333
-I$(top_srcdir)/src/bin/dwarfdump
3434
tagattr_CFLAGS = $(DWARF_CFLAGS_WARN)
3535
tagattr_LDADD = $(top_builddir)/src/lib/libdwarf/libdwarf.la
3636

37+
EXTRA_DIST = \
38+
tag_attr.list \
39+
tag_attr_ext.list
40+
3741

src/bin/tag_tree/Makefile.am

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33

44
MAINTAINERCLEANFILES = Makefile.in
55
rebuild: tagtree
6-
cp $(top_srcdir)/src/bin/dwarfdump/tag_tree.list tmp-t2.c
6+
cp $(top_srcdir)/src/bin/tag_tree/tag_tree.list tmp-t2.c
77
$(CC) -DTRIVIAL_NAMING -I$(top_srcdir)/src/lib/libdwarf -E tmp-t2.c >tmp-tag-tree-build2.tmp
88
./tagtree -s -i tmp-tag-tree-build2.tmp -o dwarfdump-tt-table.h
99
cp dwarfdump-tt-table.h $(top_srcdir)/src/bin/dwarfdump/
1010
rm -f tmp-tag-tree-build2.tmp
1111
rm -f tmp-t2.c
1212
rm -f tmp-t3.c
13-
cp $(top_srcdir)/src/bin/dwarfdump/tag_tree_ext.list tmp-t3.c
13+
cp $(top_srcdir)/src/bin/tag_tree/tag_tree_ext.list tmp-t3.c
1414
$(CC) -DTRIVIAL_NAMING -I$(top_srcdir)/src/lib/libdwarf -E tmp-t3.c > tmp-tag-tree-build3.tmp
1515
./tagtree -e -i tmp-tag-tree-build3.tmp -o dwarfdump-tt-ext-table.h
1616
cp dwarfdump-tt-ext-table.h $(top_srcdir)/src/bin/dwarfdump/
@@ -32,10 +32,14 @@ $(top_srcdir)/src/bin/dwarfdump/dd_naming.c \
3232
$(top_srcdir)/src/bin/dwarfdump/dd_glflags.c \
3333
$(top_srcdir)/src/bin/dwarfdump/dd_sanitized.c \
3434
$(top_srcdir)/src/bin/dwarfdump/dd_safe_strcpy.c \
35-
$(top_srcdir)/src/bin/dwarfdump/dd_tag_common.c
35+
$(top_srcdir)/src/bin/tag_tree/tag_common.c
3636
tagtree_CPPFLAGS = -DTRIVIAL_NAMING \
3737
-DBUILD_NONLIB_SOURCE \
3838
-I$(top_srcdir)/src/lib/libdwarf \
3939
-I$(top_srcdir)/src/bin/dwarfdump
4040
tagtree_CFLAGS = $(DWARF_CFLAGS_WARN)
4141
tagtree_LDADD = $(top_builddir)/src/lib/libdwarf/libdwarf.la
42+
43+
EXTRA_DIST = \
44+
tag_tree.list \
45+
tag_tree_ext.list

0 commit comments

Comments
 (0)