Changeset f852e706 for Makefile

Timestamp:

06/02/2016 05:39:31 AM (8 years ago)

Author:

DJ Lucas <dj@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

39045922

Parents:

9377577

Message:

Initial systemd import, update to blfs-sytemd-units-20160602, makefile changes for building both books and systemd-units

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@17424 af4574ff-66df-0310-9fd7-8a98e5e911e0

File:

• Makefile (modified) (12 diffs)

Makefile

@@ -36 +36 @@
   NOCHUNKS_OUTPUT ?= blfs-book.html
   DUMPDIR         ?= ~/blfs-commands
+  BLFSHTML        ?= blfs-html.xml
+  BLFSHTML2       ?= blfs-html2.xml
+  BLFSFULL        ?= blfs-full.xml
 else
   BASEDIR         ?= $(HOME)/public_html/blfs-systemd
   NOCHUNKS_OUTPUT ?= blfs-sysd-book.html
   DUMPDIR         ?= ~/blfs-sysd-commands
+  BLFSHTML        ?= blfs-systemd-html.xml
+  BLFSHTML2       ?= blfs-systemd-html2.xml
+  BLFSFULL        ?= blfs-systemd-full.xml
+
 endif
 
@@ -49 +56 @@
 
 html: $(BASEDIR)/index.html
-$(BASEDIR)/index.html: $(RENDERTMP)/blfs-html.xml
+$(BASEDIR)/index.html: $(RENDERTMP)/$(BLFSHTML)
         @echo "Generating chunked XHTML files..."
         $(Q)xsltproc --nonet                                    \
@@ -56 +63 @@
                 --stringparam base.dir $(BASEDIR)/         \
                 stylesheets/blfs-chunked.xsl               \
-                $(RENDERTMP)/blfs-html.xml
+                $(RENDERTMP)/$(BLFSHTML)
 
         @echo "Copying CSS code and images..."
@@ -83 +90 @@
 
 nochunks: $(BASEDIR)/$(NOCHUNKS_OUTPUT)
-$(BASEDIR)/$(NOCHUNKS_OUTPUT): $(RENDERTMP)/blfs-html.xml
+$(BASEDIR)/$(NOCHUNKS_OUTPUT): $(RENDERTMP)/$(BLFSHTML)
         @echo "Generating non-chunked XHTML file..."
         $(Q)xsltproc --nonet                                \
@@ -89 +96 @@
                 --output $(BASEDIR)/$(NOCHUNKS_OUTPUT) \
                 stylesheets/blfs-nochunks.xsl          \
-                $(RENDERTMP)/blfs-html.xml
+                $(RENDERTMP)/$(BLFSHTML)
 
         @echo "Running Tidy and obfuscate.sh on non-chunked XHTML..."
@@ -103 +110 @@
 clean:
         @echo "Cleaning $(RENDERTMP)"
-        $(Q)rm -f $(RENDERTMP)/blfs-{full,html}.xml
-        $(Q)rm -f $(RENDERTMP)/blfs-{patch-list,patches}
-
-validate: $(RENDERTMP)/blfs-full.xml
-$(RENDERTMP)/blfs-full.xml: general.ent $(ALLXML) $(ALLXSL)
+        $(Q)rm -f $(RENDERTMP)/blfs*
+
+validate: $(RENDERTMP)/$(BLFSFULL)
+$(RENDERTMP)/$(BLFSFULL): general.ent $(ALLXML) $(ALLXSL)
         $(Q)[ -d $(RENDERTMP) ] || mkdir -p $(RENDERTMP)
 
@@ -113 +119 @@
         $(Q)xsltproc --nonet                               \
                 --xinclude                            \
-                --output $(RENDERTMP)/blfs-html2.xml  \
+                --output $(RENDERTMP)/$(BLFSHTML2)  \
                 --stringparam profile.revision $(REV) \
                 stylesheets/lfs-xsl/profile.xsl       \
@@ -122 +128 @@
                --noent                             \
                --postvalid                         \
-               --output $(RENDERTMP)/blfs-full.xml \
-               $(RENDERTMP)/blfs-html2.xml
-
-profile-html: $(RENDERTMP)/blfs-html.xml
-$(RENDERTMP)/blfs-html.xml: $(RENDERTMP)/blfs-full.xml
+               --output $(RENDERTMP)/$(BLFSFULL) \
+               $(RENDERTMP)/$(BLFSHTML2)
+
+profile-html: $(RENDERTMP)/$(BLFSHTML)
+$(RENDERTMP)/$(BLFSHTML): $(RENDERTMP)/$(BLFSFULL)
         @echo "Generating profiled XML for XHTML..."
         $(Q)xsltproc --nonet                              \
                 --stringparam profile.condition html \
-                --output $(RENDERTMP)/blfs-html.xml  \
+                --output $(RENDERTMP)/$(BLFSHTML)  \
                 stylesheets/lfs-xsl/profile.xsl      \
-                $(RENDERTMP)/blfs-full.xml
+                $(RENDERTMP)/$(BLFSFULL)
 
 blfs-patch-list: blfs-patches.sh
@@ -139 +145 @@
           blfs-patches.sh > blfs-patch-list
 
-blfs-patches.sh: $(RENDERTMP)/blfs-full.xml
+blfs-patches.sh: $(RENDERTMP)/$(BLFSFULL)
         @echo "Generating blfs patch script..."
         $(Q)xsltproc --nonet                     \
                 --output blfs-patches.sh    \
                 stylesheets/patcheslist.xsl \
-                $(RENDERTMP)/blfs-full.xml
+                $(RENDERTMP)/$(BLFSFULL)
 
 wget-list: $(BASEDIR)/wget-list
-$(BASEDIR)/wget-list: $(RENDERTMP)/blfs-full.xml
+$(BASEDIR)/wget-list: $(RENDERTMP)/$(BLFSFULL)
         @echo "Generating wget list for $(REV) at $(BASEDIR)/wget-list ..."
         $(Q)mkdir -p $(BASEDIR)
@@ -153 +159 @@
                 --output $(BASEDIR)/wget-list \
                 stylesheets/wget-list.xsl     \
-                $(RENDERTMP)/blfs-full.xml
+                $(RENDERTMP)/$(BLFSFULL)
 
 test-links: $(BASEDIR)/test-links
-$(BASEDIR)/test-links: $(RENDERTMP)/blfs-full.xml
+$(BASEDIR)/test-links: $(RENDERTMP)/$(BLFSFULL)
         @echo "Generating test-links file..."
         $(Q)mkdir -p $(BASEDIR)
@@ -163 +169 @@
                 --output $(BASEDIR)/test-links \
                 stylesheets/wget-list.xsl      \
-                $(RENDERTMP)/blfs-full.xml
+                $(RENDERTMP)/$(BLFSFULL)
 
         @echo "Checking URLs, first pass..."
@@ -197 +203 @@
    fi
 
+systemd-units:
+        @VERSION=`grep "systemd-units-version " general.ent | cut -d\" -f2`; \
+   UNITS="blfs-systemd-units-$$VERSION";                        \
+   if [ ! -e $$UNITS.tar.xz ]; then                             \
+     rm -rf $(RENDERTMP)/$$UNITS;                               \
+     mkdir $(RENDERTMP)/$$UNITS;                                \
+     cp -a ../systemd-units/* $(RENDERTMP)/$$UNITS;             \
+     tar -cJhf $$UNITS.tar.xz -C $(RENDERTMP) $$UNITS;          \
+   fi
+
 dump-commands: $(DUMPDIR)
-$(DUMPDIR): $(RENDERTMP)/blfs-full.xml
+$(DUMPDIR): $(RENDERTMP)/$(BLFSFULL)
         @echo "Dumping book commands..."
         $(Q)xsltproc --output $(DUMPDIR)/          \
                 stylesheets/dump-commands.xsl \
-                $(RENDERTMP)/blfs-full.xml
+                $(RENDERTMP)/$(BLFSFULL)
         $(Q)touch $(DUMPDIR)
 
 .PHONY: blfs all world html nochunks tmpdir clean  \
    validate profile-html blfs-patch-list wget-list test-links \
-   dump-commands  bootscripts
-
-
+   dump-commands  bootscripts systemd-units
+
+