aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Dubbs <bdubbs@linuxfromscratch.org>2012-09-08 21:41:53 +0000
committerBruce Dubbs <bdubbs@linuxfromscratch.org>2012-09-08 21:41:53 +0000
commit06d04ebbfb2ec09ef9a42070c79f9c13a8ac6116 (patch)
treeb76e2d8aa644ed0783495f923da24cf96e4b537b
parent1005bde5ea4eeab943b22f514b72796f660edaa8 (diff)
Add some prereqs to udev-lfs to support make with j > 1
Add support for French version of the book. git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9987 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--stylesheets/lfs-xsl/lfs-l10n.xml16
-rw-r--r--udev-lfs/Makefile.lfs8
-rw-r--r--udev-lfs/makefile-incl.gir2
-rw-r--r--udev-lfs/makefile-incl.gudev2
4 files changed, 22 insertions, 6 deletions
diff --git a/stylesheets/lfs-xsl/lfs-l10n.xml b/stylesheets/lfs-xsl/lfs-l10n.xml
index 07a370b80..4c524057e 100644
--- a/stylesheets/lfs-xsl/lfs-l10n.xml
+++ b/stylesheets/lfs-xsl/lfs-l10n.xml
@@ -40,6 +40,22 @@ $Date$
</l:l10n>
+ <!-- French -->
+ <l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0"
+ language="fr" english-language-name="French">
+
+ <l:gentext key="description" text="description"/>
+ <l:gentext key="Bootscripts" text="Scripts de démarrage"/>
+ <l:gentext key="Configuration Files" text="Fichiers de configuration"/>
+ <l:gentext key="Kernel Configuration" text="Configuration du noyau"/>
+ <l:gentext key="Libraries" text="Bibliothèques"/>
+ <l:gentext key="Others" text="Autres"/>
+ <l:gentext key="Packages" text="Paquets"/>
+ <l:gentext key="Programs" text="Programmes"/>
+ <l:gentext key="Scripts" text="Scripts"/>
+
+ </l:l10n>
+
<!-- Italian -->
<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0"
language="it" english-language-name="Italian">
diff --git a/udev-lfs/Makefile.lfs b/udev-lfs/Makefile.lfs
index b3a864977..9bce8cf2a 100644
--- a/udev-lfs/Makefile.lfs
+++ b/udev-lfs/Makefile.lfs
@@ -159,17 +159,17 @@ common: udev-lfs-$(VERSION)/cfg.h
@mkdir -p build
cp udev-lfs-$(VERSION)/cfg.h .
-build/%o: %c
+build/%o: %c common
@echo CC $<
$(VB)gcc -c $(WARN) $(OPTIONS2) $(INCLUDE) $(DEF) -o $@ $<
# Sources from src/libudev use -fvisibility=hidden
-build/%o: src/libudev/%c
+build/%o: src/libudev/%c common
@echo CC $<
$(VB)gcc -c $(WARN) $(OPTIONS) $(INCLUDE) $(DEF) -o $@ $<
# Sources from src/shared use -fvisibility=hidden
-build/%o: src/shared/%c
+build/%o: src/shared/%c common
@echo CC $<
$(VB)gcc -c $(WARN) $(OPTIONS) $(INCLUDE) $(DEF) -o $@ $<
@@ -246,7 +246,7 @@ build/collect: build/collect.o build/$(COMMON_LIB)
$(VB)gcc build/collect.o -o $@ build/udev-local.a build/$(COMMON_LIB) $(LDFLAGS)
$(VB)strip --strip-unneeded $@
-build/%pc: %pc.in
+build/%pc: %pc.in common
@echo GEN $@
@$(SED_PROCESS)
diff --git a/udev-lfs/makefile-incl.gir b/udev-lfs/makefile-incl.gir
index 30641ee12..0e6259857 100644
--- a/udev-lfs/makefile-incl.gir
+++ b/udev-lfs/makefile-incl.gir
@@ -41,7 +41,7 @@ gir-data: build/GUdev-1.0.gir build/GUdev-1.0.typelib
install-gir-data: gir-data
@mkdir -pv $(DESTDIR)/usr/lib/girepository-1.0 \
- $(DESTDIR)/usr/share/gir-1.0
+ $(DESTDIR)/usr/share/gir-1.0
@cp -v build/GUdev-1.0.typelib $(DESTDIR)/usr/lib/girepository-1.0
@cp -v build/GUdev-1.0.gir $(DESTDIR)/usr/share/gir-1.0
diff --git a/udev-lfs/makefile-incl.gudev b/udev-lfs/makefile-incl.gudev
index 49c7554cf..b560fcd6e 100644
--- a/udev-lfs/makefile-incl.gudev
+++ b/udev-lfs/makefile-incl.gudev
@@ -78,7 +78,7 @@ build/$(LIBGUDEV_REAL_NAME): $(LIBGUDEV_OBJS) build/udev-local.a build/$(LIBUDEV
ln -sfn $(LIBGUDEV_REAL_NAME) build/$(LIBGUDEV_LINK_NAME)
ln -sfn $(LIBGUDEV_REAL_NAME) build/$(LIBGUDEV_SONAME)
-build/gudev-1.0.pc: src/gudev/gudev-1.0.pc.in
+build/gudev-1.0.pc: src/gudev/gudev-1.0.pc.in common
@echo GEN $@
@$(SED_PROCESS)