[lfs-book] r9953 - trunk/udev-lfs

bdubbs at linuxfromscratch.org bdubbs at linuxfromscratch.org
Tue Aug 21 18:38:00 PDT 2012


Author: bdubbs
Date: 2012-08-21 19:37:56 -0600 (Tue, 21 Aug 2012)
New Revision: 9953

Modified:
   trunk/udev-lfs/Makefile.lfs
   trunk/udev-lfs/makefile-incl.gudev
   trunk/udev-lfs/makefile-incl.keymap
Log:
Updates for BLFS keymap and gudev


Modified: trunk/udev-lfs/Makefile.lfs
===================================================================
--- trunk/udev-lfs/Makefile.lfs	2012-08-22 01:21:05 UTC (rev 9952)
+++ trunk/udev-lfs/Makefile.lfs	2012-08-22 01:37:56 UTC (rev 9953)
@@ -140,8 +140,7 @@
         < $< > $@
 
 
-udev: cfg.h                      \
-      build                      \
+udev: common                     \
       build/$(COMMON_LIB)        \
       build/$(LIBUDEV_REAL_NAME) \
       build/udevd                \
@@ -156,10 +155,8 @@
       build/udev.pc              \
       build/libudev.pc
 
-build:
+common: udev-lfs-$(VERSION)/cfg.h
 	@mkdir -p build
-
-cfg.h: udev-lfs-$(VERSION)/cfg.h
 	cp udev-lfs-$(VERSION)/cfg.h .
 
 build/%o: %c
@@ -250,7 +247,7 @@
 	$(VB)strip --strip-unneeded $@
 
 build/%pc: %pc.in
-	@echo SED $<
+	@echo GEN $@
 	@$(SED_PROCESS)
 
 install: udev

Modified: trunk/udev-lfs/makefile-incl.gudev
===================================================================
--- trunk/udev-lfs/makefile-incl.gudev	2012-08-22 01:21:05 UTC (rev 9952)
+++ trunk/udev-lfs/makefile-incl.gudev	2012-08-22 01:37:56 UTC (rev 9953)
@@ -66,8 +66,8 @@
 	@echo GEN $@
 	$(VB)glib-mkenums --template $^ > $@
 
-build/%o: src/gudev/%c build cfg.h $(GUDEV_GENERATED)
-	@echo CCGUDEV $<
+build/%o: src/gudev/%c $(GUDEV_GENERATED) common
+	@echo CC $<
 	$(VB)gcc -c $(LIBGUDEV_CFLAGS) $(WARN) $(OPTIONS) $(INCLUDE) $(DEF) -o $@ $<
 
 build/$(LIBGUDEV_REAL_NAME): $(LIBGUDEV_OBJS) build/udev-local.a build/$(LIBUDEV_REAL_NAME)
@@ -78,9 +78,11 @@
 	ln -sfn $(LIBGUDEV_REAL_NAME) build/$(LIBGUDEV_LINK_NAME)
 	ln -sfn $(LIBGUDEV_REAL_NAME) build/$(LIBGUDEV_SONAME)
 
-VPATH += src/gudev
+build/gudev-1.0.pc: src/gudev/gudev-1.0.pc.in
+	@echo GEN $@
+	@$(SED_PROCESS)
 
-gudev: build cfg.h build/$(LIBGUDEV_REAL_NAME) build/gudev-1.0.pc
+gudev: build/$(LIBGUDEV_REAL_NAME) build/gudev-1.0.pc
 
 clean-gudev:
 	rm -f src/gudev/gudevmarshal.h
@@ -101,6 +103,6 @@
 	@ln -svfn $(LIBGUDEV_REAL_NAME) $(DESTDIR)/usr/lib/$(LIBGUDEV_SONAME)
 	@ln -svfn $(LIBGUDEV_REAL_NAME) $(DESTDIR)/usr/lib/$(LIBGUDEV_LINK_NAME)
 
-	@cp -v build/gudev-1.0.pc       $(DESTDIR)/usr/lib/pkgconfig/gudev-1.0.pc
+	@cp -v build/gudev-1.0.pc       $(DESTDIR)/usr/lib/pkgconfig
 	@cp -v docs/gudev/html/*        $(DESTDIR)/usr/share/gtk-doc/html/gudev
 

Modified: trunk/udev-lfs/makefile-incl.keymap
===================================================================
--- trunk/udev-lfs/makefile-incl.keymap	2012-08-22 01:21:05 UTC (rev 9952)
+++ trunk/udev-lfs/makefile-incl.keymap	2012-08-22 01:37:56 UTC (rev 9953)
@@ -1,4 +1,4 @@
-# Custom systemd Makefile include that builds/installs gir only for LFS
+# Custom systemd Makefile include that builds/installs keymap tool only for LFS
 
 # vim: tabstop=3
 
@@ -70,10 +70,10 @@
    keymaps-force-release/samsung-90x3a \
    keymaps-force-release/common-volume-keys
 
-KEYMAP_DEPS = src/udev/keymap/keys-from-name.h src/udev/keymap/keys-to-name.h
+KEYMAP_DEPS = common src/udev/keymap/keys-from-name.h src/udev/keymap/keys-to-name.h
 
 src/udev/keymap/keys.txt:
-	@echo AWK $@
+	@echo GEN $@
 	$(VB)awk '/^#define.*KEY_[^ ]+[ \t]+[0-9]/ \
    {                                         \
      if ($$2 != "KEY_MAX") { print $$2 }     \
@@ -81,7 +81,7 @@
    /usr/include/linux/input.h | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@
 
 src/udev/keymap/keys-from-name.gperf: src/udev/keymap/keys.txt
-	@echo AWK $@
+	@echo GEN $@
 	$(VB)awk 'BEGIN                       \
    {                                    \
      print "struct key                  \
@@ -97,11 +97,11 @@
    }' $< > $@
 
 src/udev/keymap/keys-from-name.h: src/udev/keymap/keys-from-name.gperf
-	@echo GPERF $@
+	@echo GEN $@
 	$(VB)gperf -L ANSI-C -t --ignore-case -N lookup_key -H hash_key_name -p -C $< > $@
 
 src/udev/keymap/keys-to-name.h: src/udev/keymap/keys.txt 
-	@echo AWK $@
+	@echo GEN $@
 	$(VB)awk 'BEGIN                                     \
    {                                                   \
      print "const char* const key_names[KEY_CNT] = { " \
@@ -112,7 +112,7 @@
    END{print "};"                                      \
    }' $< > $@
 
-build/keymap: cfg.h src/udev/keymap/keymap.c build/$(COMMON_LIB) $(KEYMAP_DEPS)
+build/keymap: src/udev/keymap/keymap.c build/$(COMMON_LIB) $(KEYMAP_DEPS)
 	@echo LINK $@
 	$(VB)gcc $< -o $@ -I src/udev/keymap $(WARN) $(OPTIONS2) $(INCLUDE) $(DEF) \
       build/$(COMMON_LIB) $(LDFLAGS)




More information about the lfs-book mailing list