2 p.m.
Signed-off-by: Jeffrey Blank <blank(a)eclipse.ncsc.mil>
---
RHEL6/Makefile | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/RHEL6/Makefile b/RHEL6/Makefile
index 0046727..011316d 100644
--- a/RHEL6/Makefile
+++ b/RHEL6/Makefile
@@ -7,7 +7,7 @@ DIST = dist
ID = ssg
-all: shorthand-guide shorthand2xccdf tables guide checks content dist
+all: shorthand2xccdf tables guide checks content dist
shorthand-guide:
xsltproc -o $(OUT)/rhel6-shorthand.xml $(IN)/guide.xslt $(IN)/guide.xml
@@ -31,7 +31,7 @@ checks:
$(TRANS)/combinechecks.py $(IN)/checks > $(OUT)/unlinked-rhel6-oval.xml
xmllint --format --output $(OUT)/unlinked-rhel6-oval.xml $(OUT)/unlinked-rhel6-oval.xml
-guide: shorthand-guide shorthand2xccdf
+guide: shorthand2xccdf
# remove auxiliary Groups which are only for use in tables, and not guide output.
# specifying a nonexistent profile, "allrules," to make oscap print all Rules
xsltproc -o $(OUT)/unlinked-rhel6-xccdf.xml $(TRANS)/xccdf-removeaux.xslt
$(OUT)/unlinked-rhel6-xccdf.xml
@@ -42,7 +42,7 @@ guide: shorthand-guide shorthand2xccdf
# xsltproc -o $(XCCDF_OUTPUT_DIR)/rhel5-shorthand.xml $(TRANS)/xccdf2shorthand.xslt
$(REFS)/usgcb-rhel5desktop-xccdf.xml
# tidy -m -xml -utf8 --indent-spaces=0 $(XCCDF_OUTPUT_DIR)/rhel5-shorthand.xml
-table-profilenistrefs: shorthand-guide shorthand2xccdf
+table-profilenistrefs: shorthand2xccdf
xsltproc -stringparam profile "desktop" -o
$(OUT)/table-rhel6-nistrefs-desktop.html \
$(TRANS)/xccdf2table-profilenistrefs.xslt $(OUT)/unlinked-rhel6-xccdf.xml
xsltproc -stringparam profile "server" -o
$(OUT)/table-rhel6-nistrefs-server.html \
@@ -52,18 +52,18 @@ table-profilenistrefs: shorthand-guide shorthand2xccdf
xsltproc -stringparam profile "ftp" -o $(OUT)/table-rhel6-nistrefs-ftp.html \
$(TRANS)/xccdf2table-profilenistrefs.xslt $(OUT)/unlinked-rhel6-xccdf.xml
-table-refs: shorthand-guide shorthand2xccdf
+table-refs: shorthand2xccdf
xsltproc -stringparam ref "nist" -o $(OUT)/table-rhel6-nistrefs.html
$(TRANS)/xccdf2table-byref.xslt $(OUT)/unlinked-rhel6-xccdf.xml
# break apart references by delimiter:
xsltproc -stringparam ref "nist" -stringparam delim "," -o
$(OUT)/table-rhel6-nistrefs-delim.html $(TRANS)/xccdf2table-byref.xslt
$(OUT)/unlinked-rhel6-xccdf.xml
# then sort them:
xsltproc --html -o $(OUT)/table-rhel6-nistrefs-delim-sorted.html
$(TRANS)/table-sortbyref.xslt $(OUT)/table-rhel6-nistrefs-delim.html
-table-idents: shorthand-guide shorthand2xccdf
+table-idents: shorthand2xccdf
xsltproc -o $(OUT)/table-rhel6-cces.html $(TRANS)/xccdf2table-cce.xslt
$(OUT)/unlinked-rhel6-xccdf.xml
xsltproc -stringparam ref "../$(REFS)/cce-rhel5.xml" -o
$(OUT)/table-rhel6-cces-rhel5.html $(TRANS)/xccdf2table-cce.xslt
$(OUT)/unlinked-rhel6-xccdf.xml
-table-srgmap: shorthand-guide shorthand2xccdf
+table-srgmap: shorthand2xccdf
# the map-to-items filename must be provided relative to the root of the main document
being processed
xsltproc -stringparam map-to-items "../$(OUT)/unlinked-rhel6-xccdf.xml" -o
$(OUT)/table-rhel6-srgmap.html \
$(TRANS)/table-srgmap.xslt $(REFS)/disa-os-srg-v1r1.xml
@@ -94,7 +94,7 @@ alt-titles: shorthand2xccdf
$(UTILS)/sync-alt-titles.py -p stig-server -f $(IN)/auxiliary/alt-titles-stig.xml
$(OUT)/unlinked-rhel6-xccdf.xml
XMLLINT_INDENT="" xmllint --format --output
$(IN)/auxiliary/alt-titles-stig.xml $(IN)/auxiliary/alt-titles-stig.xml
-content: shorthand-guide shorthand2xccdf guide checks
+content: shorthand2xccdf guide checks
# the relabelids.py script chdirs to ./output, so refer to files from there.
# its second argument controls the IDs, as well as the output filenames.
# thus, with ID set to ssg, this creates ssg-rhel6-xccdf.xml and ssg-rhel6-oval.xml.
@@ -103,7 +103,7 @@ content: shorthand-guide shorthand2xccdf guide checks
$(TRANS)/relabelids.py unlinked-ocilrefs-rhel6-xccdf.xml $(ID)
# not ready until oscap resolve behavior resolved
-content-stig: shorthand-guide shorthand2xccdf guide checks
+content-stig: shorthand2xccdf guide checks
xsltproc -stringparam alttitles "../$(IN)/auxiliary/alt-titles-stig.xml" -o
$(OUT)/unlinked-rhel6-xccdf.xml \
$(TRANS)/xccdf-alt-titles.xslt \
$(OUT)/unlinked-rhel6-xccdf.xml
--
1.7.1