From 1b7e00ed0216e4c68ac6a5fcec42e4f81e556ea3 Mon Sep 17 00:00:00 2001 From: Nikos Mavrogiannopoulos Date: Tue, 13 Dec 2016 08:27:05 +0100 Subject: [PATCH] Use unique names for autogen files This addresses issue in parallel builds caused by autogen using the same temporary files for both occtl and ocpasswd files. Resolves #76 --- Makefile.am | 8 ++++---- configure.ac | 4 ++-- doc/Makefile.am | 4 ++-- src/occtl/Makefile.am | 2 +- src/occtl/{args.def => occtl-args.def} | 0 src/ocpasswd/Makefile.am | 14 +++++++------- src/ocpasswd/{args.c.in => ocpasswd-args.c.in} | 8 ++++---- src/ocpasswd/{args.def => ocpasswd-args.def} | 0 src/ocpasswd/{args.h.in => ocpasswd-args.h.in} | 12 ++++++------ src/ocpasswd/ocpasswd.c | 2 +- 10 files changed, 27 insertions(+), 27 deletions(-) rename src/occtl/{args.def => occtl-args.def} (100%) rename src/ocpasswd/{args.c.in => ocpasswd-args.c.in} (99%) rename src/ocpasswd/{args.def => ocpasswd-args.def} (100%) rename src/ocpasswd/{args.h.in => ocpasswd-args.h.in} (96%) diff --git a/Makefile.am b/Makefile.am index 1f2405be..dec7e830 100644 --- a/Makefile.am +++ b/Makefile.am @@ -38,8 +38,8 @@ ChangeLog: files-update: cp -f $(builddir)/src/ocserv-args.c $(srcdir)/src/ocserv-args.c.in cp -f $(builddir)/src/ocserv-args.h $(srcdir)/src/ocserv-args.h.in - cp -f $(builddir)/src/ocpasswd/args.c $(srcdir)/src/ocpasswd/args.c.in - cp -f $(builddir)/src/ocpasswd/args.h $(srcdir)/src/ocpasswd/args.h.in + cp -f $(builddir)/src/ocpasswd/ocpasswd-args.c $(srcdir)/src/ocpasswd/ocpasswd-args.c.in + cp -f $(builddir)/src/ocpasswd/ocpasswd-args.h $(srcdir)/src/ocpasswd/ocpasswd-args.h.in files-compare: @echo "*****************************************************************" @@ -48,8 +48,8 @@ files-compare: @echo "*****************************************************************" cmp $(srcdir)/src/ocserv-args.c.in $(builddir)/src/ocserv-args.c cmp $(srcdir)/src/ocserv-args.h.in $(builddir)/src/ocserv-args.h - cmp $(srcdir)/src/ocpasswd/args.c.in $(builddir)/src/ocpasswd/args.c - cmp $(srcdir)/src/ocpasswd/args.h.in $(builddir)/src/ocpasswd/args.h + cmp $(srcdir)/src/ocpasswd/ocpasswd-args.c.in $(builddir)/src/ocpasswd/ocpasswd-args.c + cmp $(srcdir)/src/ocpasswd/ocpasswd-args.h.in $(builddir)/src/ocpasswd/ocpasswd-args.h dist-hook: files-compare ChangeLog mv ChangeLog $(distdir) diff --git a/configure.ac b/configure.ac index 93cb505a..7deeae82 100644 --- a/configure.ac +++ b/configure.ac @@ -497,8 +497,8 @@ AC_SUBST([ROOTGID], [$gid]) LIBOPTS_CHECK([libopts]) if test "$NEED_LIBOPTS_DIR" = "true";then dnl create libopts-generated files - AC_CONFIG_LINKS([src/ocpasswd/args.c:src/ocpasswd/args.c.in - src/ocpasswd/args.h:src/ocpasswd/args.h.in + AC_CONFIG_LINKS([src/ocpasswd/ocpasswd-args.c:src/ocpasswd/ocpasswd-args.c.in + src/ocpasswd/ocpasswd-args.h:src/ocpasswd/ocpasswd-args.h.in src/ocserv-args.c:src/ocserv-args.c.in src/ocserv-args.h:src/ocserv-args.h.in]) AC_SUBST([AUTOGEN], [:]) diff --git a/doc/Makefile.am b/doc/Makefile.am index 3f12bb92..3ee8c7ab 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -10,12 +10,12 @@ ocserv.8: ../src/ocserv-args.def @AUTOGEN@ -L../src -DMAN_SECTION=8 -Tagman-cmd.tpl "$<".tmp && \ rm -f "$<".tmp -occtl.8: ../src/occtl/args.def +occtl.8: ../src/occtl/occtl-args.def -$(SED) 's/@subheading \(.*\)/@*\n@var{\1}\n@*/' $< > "$<".tmp && \ @AUTOGEN@ -L../src -DMAN_SECTION=8 -Tagman-cmd.tpl "$<".tmp && \ rm -f "$<".tmp -ocpasswd.8: ../src/ocpasswd/args.def +ocpasswd.8: ../src/ocpasswd/ocpasswd-args.def -$(SED) 's/@subheading \(.*\)/@*\n@var{\1}\n@*/' $< > "$<".tmp && \ @AUTOGEN@ -L../src -DMAN_SECTION=8 -Tagman-cmd.tpl "$<".tmp && \ rm -f "$<".tmp diff --git a/src/occtl/Makefile.am b/src/occtl/Makefile.am index 07cb7441..381412cf 100644 --- a/src/occtl/Makefile.am +++ b/src/occtl/Makefile.am @@ -5,7 +5,7 @@ AM_CPPFLAGS += -I$(srcdir)/../../gl/ -I$(builddir)/../../gl/ \ $(LIBNL3_CFLAGS) $(LIBPROTOBUF_C_CFLAGS) $(LIBTALLOC_CFLAGS) \ -I$(srcdir)/../common/ -I$(builddir)/../common/ $(CODE_COVERAGE_CFLAGS) -EXTRA_DIST = args.def +EXTRA_DIST = occtl-args.def bin_PROGRAMS = occtl diff --git a/src/occtl/args.def b/src/occtl/occtl-args.def similarity index 100% rename from src/occtl/args.def rename to src/occtl/occtl-args.def diff --git a/src/ocpasswd/Makefile.am b/src/ocpasswd/Makefile.am index e178bd24..90bbb907 100644 --- a/src/ocpasswd/Makefile.am +++ b/src/ocpasswd/Makefile.am @@ -6,25 +6,25 @@ AM_CPPFLAGS += -I$(srcdir)/../../gl/ -I$(builddir)/../../gl/ \ $(CODE_COVERAGE_CFLAGS) $(LIBGNUTLS_CFLAGS) -EXTRA_DIST = args.def args.c.in args.h.in +EXTRA_DIST = ocpasswd-args.def ocpasswd-args.c.in ocpasswd-args.h.in -BUILT_SOURCES = args.c args.h +BUILT_SOURCES = ocpasswd-args.c ocpasswd-args.h bin_PROGRAMS = ocpasswd noinst_LIBRARIES = libcmd-ocpasswd.a -libcmd_ocpasswd_a_SOURCES = args.def args.c args.h +libcmd_ocpasswd_a_SOURCES = ocpasswd-args.def ocpasswd-args.c ocpasswd-args.h ocpasswd_SOURCES = ocpasswd.c ocpasswd_LDADD = ../../gl/libgnu.a $(NEEDED_LIBOPTS) libcmd-ocpasswd.a ocpasswd_LDADD += $(LIBGNUTLS_LIBS) $(LIBCRYPT) $(CODE_COVERAGE_LDFLAGS) \ $(LIBNETTLE_LIBS) -args.stamp: $(srcdir)/args.def $(builddir)/../version.inc +ocpasswd-args.stamp: $(srcdir)/ocpasswd-args.def $(builddir)/../version.inc $(AUTOGEN) $< touch $@ -args.h: args.stamp -args.c: args.stamp +ocpasswd-args.h: ocpasswd-args.stamp +ocpasswd-args.c: ocpasswd-args.stamp clean-local: - rm -f args.stamp + rm -f ocpasswd-args.stamp diff --git a/src/ocpasswd/args.c.in b/src/ocpasswd/ocpasswd-args.c.in similarity index 99% rename from src/ocpasswd/args.c.in rename to src/ocpasswd/ocpasswd-args.c.in index e8dbea95..8a0cfa82 100644 --- a/src/ocpasswd/args.c.in +++ b/src/ocpasswd/ocpasswd-args.c.in @@ -1,9 +1,9 @@ /* -*- buffer-read-only: t -*- vi: set ro: * - * DO NOT EDIT THIS FILE (args.c) + * DO NOT EDIT THIS FILE (ocpasswd-args.c) * * It has been AutoGen-ed - * From the definitions args.def + * From the definitions ocpasswd-args.def * and the template file options * * Generated from AutoOpts 41:1:16 templates. @@ -40,7 +40,7 @@ #ifndef __doxygen__ #define OPTION_CODE_COMPILE 1 -#include "args.h" +#include "ocpasswd-args.h" #include #include @@ -945,4 +945,4 @@ ocpasswd --help for usage instructions.\n")); #ifdef __cplusplus } #endif -/* args.c ends here */ +/* ocpasswd-args.c ends here */ diff --git a/src/ocpasswd/args.def b/src/ocpasswd/ocpasswd-args.def similarity index 100% rename from src/ocpasswd/args.def rename to src/ocpasswd/ocpasswd-args.def diff --git a/src/ocpasswd/args.h.in b/src/ocpasswd/ocpasswd-args.h.in similarity index 96% rename from src/ocpasswd/args.h.in rename to src/ocpasswd/ocpasswd-args.h.in index a1a1bbaf..3d673dd3 100644 --- a/src/ocpasswd/args.h.in +++ b/src/ocpasswd/ocpasswd-args.h.in @@ -1,9 +1,9 @@ /* -*- buffer-read-only: t -*- vi: set ro: * - * DO NOT EDIT THIS FILE (args.h) + * DO NOT EDIT THIS FILE (ocpasswd-args.h) * * It has been AutoGen-ed - * From the definitions args.def + * From the definitions ocpasswd-args.def * and the template file options * * Generated from AutoOpts 41:1:16 templates. @@ -43,8 +43,8 @@ * These macros are documented in the AutoGen info file in the * "AutoOpts" chapter. Please refer to that doc for usage help. */ -#ifndef AUTOOPTS_ARGS_H_GUARD -#define AUTOOPTS_ARGS_H_GUARD 1 +#ifndef AUTOOPTS_OCPASSWD_ARGS_H_GUARD +#define AUTOOPTS_OCPASSWD_ARGS_H_GUARD 1 #include "config.h" #include @@ -210,6 +210,6 @@ static inline char* aoGetsText(char const* pz) { #ifdef __cplusplus } #endif -#endif /* AUTOOPTS_ARGS_H_GUARD */ +#endif /* AUTOOPTS_OCPASSWD_ARGS_H_GUARD */ -/* args.h ends here */ +/* ocpasswd-args.h ends here */ diff --git a/src/ocpasswd/ocpasswd.c b/src/ocpasswd/ocpasswd.c index c7af1d31..fabaf8ac 100644 --- a/src/ocpasswd/ocpasswd.c +++ b/src/ocpasswd/ocpasswd.c @@ -31,7 +31,7 @@ #include /* for random */ #include #include -#include "args.h" +#include "ocpasswd-args.h" /* Gnulib portability files. */ #include