[systemd-commits] 2 commits - Makefile.am .ycm_extra_conf.py

[Dave Reisner]

 .ycm_extra_conf.py |    2 ++
 Makefile.am        |   17 +++++++----------
 2 files changed, 9 insertions(+), 10 deletions(-)

New commits:
commit 7d74558bb6946be0c3c14a3e37b5161a79111c55
Author: Dave Reisner <dreisner at archlinux.org>
Date:   Fri Nov 15 22:44:15 2013 -0500

    ycm_extra_conf: include src/systemd for headers

diff --git a/.ycm_extra_conf.py b/.ycm_extra_conf.py
index 06a2344..57b868a 100644
--- a/.ycm_extra_conf.py
+++ b/.ycm_extra_conf.py
@@ -11,6 +11,8 @@ flags = [
 '/usr/include/dbus-1.0',
 '-I',
 './src/shared',
+'-I',
+'./src/systemd',
 '-Wall',
 '-Wextra',
 '-Werror',

commit 4e1b76c214704dcec41b43ea218cc42a531a1765
Author: Dave Reisner <dreisner at archlinux.org>
Date:   Fri Nov 15 22:38:12 2013 -0500

    build: use printf to generate symbol tests
    
    echo is basically unportable, so use printf instead.

diff --git a/Makefile.am b/Makefile.am
index a2c60f2..04e8e32 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4712,16 +4712,13 @@ check-api-unused: defined undefined exported
 
 define generate-sym-test
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
-	$(AM_V_at)echo '#include <stdio.h>' > $@
-	$(AM_V_at)for file in $(notdir $(filter %.h, $^)); do \
-		echo "#include \"$$file\""; \
-	done >> $@
-	$(AM_V_at)echo 'void* functions[] = {' >> $@
-	$(AM_V_GEN)sed -r -n 's/^( +[a-zA-Z0-9_]+);/\1,/p' $< >> $@
-	$(AM_V_at)echo '};' >> $@
-	$(AM_V_at)echo 'int main(void) {' >> $@
-	$(AM_V_at)echo ' unsigned i; for (i=0;i<sizeof(functions)/sizeof(void*);i++) printf("%p\n", functions[i]);' >> $@
-	$(AM_V_at)echo 'return 0; }' >> $@
+	$(AM_V_at)printf '#include <stdio.h>\n' > $@
+	$(AM_V_at)printf '#include "%s"\n' $(notdir $(filter %.h, $^)) >> $@
+	$(AM_V_at)printf 'void* functions[] = {\n' >> $@
+	$(AM_V_GEN)sed -r -n 's/^ +([a-zA-Z0-9_]+);/\1,/p' $< >> $@
+	$(AM_V_at)printf '};\nint main(void) {\n' >> $@
+	$(AM_V_at)printf 'unsigned i; for (i=0;i<sizeof(functions)/sizeof(void*);i++) printf("%%p\\n", functions[i]);\n' >> $@
+	$(AM_V_at)printf 'return 0; }\n' >> $@
 endef
 
 test-libsystemd-bus-sym.c: \