diff options
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rwxr-xr-x | move.sh | 2 | ||||
| -rw-r--r-- | src/libbasic/include/basic/Makefile (renamed from src/libbasic/include/Makefile) | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index c991c78f62..c217e223e0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1367,7 +1367,9 @@ CLEANFILES += \ $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_GPERF)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_$(notdir $*) -H hash_$(notdir $*)_name -p -C <$< >$@ -#@src/libbasic/include/Makefile +#@src/libbasic/include/basic/Makefile +at.subdirs += basic +#@src/libbasic/include/basic/Makefile src/basic/errno-list.txt: $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include errno.h - </dev/null | $(AWK) '/^#define[ \t]+E[^ _]+[ \t]+/ { print $$2; }' >$@ @@ -325,7 +325,7 @@ fixup_makefiles() ( -e 's/ \$\(CPPFLAGS\) / /g' \ -e 's/ \$\(AM_CPPFLAGS\) / $(ALL_CPPFLAGS) /g' \ -e '/^[^# ]*:/ { s|\S+/|$(outdir)/|g }' \ - src/libbasic/include/Makefile \ + src/libbasic/include/basic/Makefile \ src/libsystemd/src/Makefile \ src/libsystemd/src/sd-journal/Makefile \ src/grp-udev/libudev-core/Makefile diff --git a/src/libbasic/include/Makefile b/src/libbasic/include/basic/Makefile index 9e02ce2c39..41d6ba243f 100644 --- a/src/libbasic/include/Makefile +++ b/src/libbasic/include/basic/Makefile @@ -20,9 +20,10 @@ # # You should have received a copy of the GNU Lesser General Public License # along with systemd; If not, see <http://www.gnu.org/licenses/>. -include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk +include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk +at.subdirs += basic $(outdir)/errno-list.txt: $(AM_V_GEN)$(CPP) $(ALL_CPPFLAGS) -dM -include errno.h - </dev/null | $(AWK) '/^#define[ \t]+E[^ _]+[ \t]+/ { print $$2; }' >$@ |