diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-08-08 13:20:56 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-08-08 13:20:56 -0400 |
| commit | 1cfeca882ebbd2de350a62e97e7ace35d3a57644 (patch) | |
| tree | e6ca6b8ae85c643f1c4a59d9467e74fd4825c8a7 /src/grp-udev/libudev-core | |
| parent | 7f991fe569fc0562c9d67b3a473f9a4dda8dbc4d (diff) | |
fix
Diffstat (limited to 'src/grp-udev/libudev-core')
| -rw-r--r-- | src/grp-udev/libudev-core/Makefile | 6 | ||||
| -rw-r--r-- | src/grp-udev/libudev-core/net/Makefile | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/grp-udev/libudev-core/Makefile b/src/grp-udev/libudev-core/Makefile index d47fbe3257..f2b8c88eaf 100644 --- a/src/grp-udev/libudev-core/Makefile +++ b/src/grp-udev/libudev-core/Makefile @@ -27,7 +27,7 @@ noinst_LTLIBRARIES += \ libudev-core.la $(outdir)/keyboard-keys-list.txt: - $(AM_V_GEN)$(CPP) $(ALL_CPPFLAGS) -dM -include linux/input.h - < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9K]/ { if ($$2 != "KEY_MAX") { print $$2 } }' > $@ + $(AM_V_GEN)$(CPP) $(sd.ALL_CPPFLAGS) -dM -include linux/input.h - < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9K]/ { if ($$2 != "KEY_MAX") { print $$2 } }' > $@ $(outdir)/keyboard-keys-from-name.gperf: $(outdir)/keyboard-keys-list.txt $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct key { const char* name; unsigned short id; };"; print "%null-strings"; print "%%";} { print tolower(substr($$1 ,5)) ", " $$1 }' < $< > $@ @@ -100,8 +100,8 @@ endif # HAVE_ACL libudev-core.la.SOURCES = $(patsubst src/udev/%,%,$(filter %.c,$(_libudev_core_la_SOURCES) $(_nodist_libudev_core_la_SOURCES))) libudev-core.la.DEPENDS = $(addprefix $(outdir)/,$(libudev-core.la.SOURCES:.c=.lo)) -at.subdirs += net +nested.subdirs += net $(outdir)/udev-builtin-keyboard.lo: $(outdir)/keyboard-keys-from-name.h -systemd.CPPFLAGS += -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" +sd.CPPFLAGS += -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-udev/libudev-core/net/Makefile b/src/grp-udev/libudev-core/net/Makefile index 153afd5089..5ccbd00002 100644 --- a/src/grp-udev/libudev-core/net/Makefile +++ b/src/grp-udev/libudev-core/net/Makefile @@ -24,7 +24,7 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk -systemd.CPPFLAGS += $(libshared.CPPFLAGS) -systemd.CPPFLAGS += $(libsystemd-network.CPPFLAGS) +sd.CPPFLAGS += $(libshared.CPPFLAGS) +sd.CPPFLAGS += $(libsystemd-network.CPPFLAGS) include $(topsrcdir)/build-aux/Makefile.tail.mk |