Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Various files were missing from the make dist tarball. Also fixed som…

…e whitespace issues.
  • Loading branch information...
commit 1245049f162b9aa23473156426ff30ff70369212 1 parent 28aaa4d
@jimis jimis authored
View
12 Makefile.am
@@ -16,12 +16,12 @@ DIST_SUBDIRS = libcompat libutils libcfnet libenv libpromises cf-agent cf-execd
# Set explicitly to avoid picking up {nova}/*.m4
DIST_COMMON = README.md Makefile.am Makefile.in configure AUTHORS aclocal.m4 \
- ChangeLog INSTALL config.guess config.sub depcomp install-sh \
- ltmain.sh missing ylwrap m4/acinclude.m4 m4/libtool.m4 m4/ltoptions.m4 \
- m4/ltsugar.m4 m4/ltversion.m4 m4/lt~obsolete.m4 m4/cf3_with_library.m4 \
- m4/snprintf.m4 m4/old-autoconf.m4 m4/adl_recursive_eval.m4 \
- m4/cf3_check_proper_func.m4 configure.ac \
- autogen.sh compile
+ ChangeLog INSTALL config.guess config.sub depcomp install-sh \
+ ltmain.sh missing ylwrap m4/acinclude.m4 m4/libtool.m4 m4/ltoptions.m4 \
+ m4/ltsugar.m4 m4/ltversion.m4 m4/lt~obsolete.m4 m4/cf3_with_library.m4 \
+ m4/snprintf.m4 m4/old-autoconf.m4 m4/adl_recursive_eval.m4 \
+ m4/cf3_check_proper_func.m4 m4/cf3_platforms.m4 m4/cf3_gcc_flags.m4 \
+ m4/cf3_path_root_prog.m4 configure.ac autogen.sh compile configure_flags.env.in
EXTRA_DIST = ChangeLog INSTALL README.md LICENSE
View
3  cf-agent/Makefile.am
@@ -70,7 +70,8 @@ libcf_agent_la_SOURCES = \
vercmp_internal.c vercmp_internal.h \
vercmp.c vercmp.h \
verify_packages.c verify_packages.h \
- verify_users.c verify_users.h
+ verify_users.c verify_users.h \
+ cf-agent-windows-functions.h
if !NT
libcf_agent_la_SOURCES += nfs.c nfs.h
View
4 create_tarball.sh
@@ -19,7 +19,7 @@ dist()
{
git checkout $BRANCH
- NO_SUBPROJECTS=1 ./autogen.sh
+ ./autogen.sh --with-tokyocabinet=/usr
make dist
}
@@ -30,7 +30,7 @@ check()
cd ..
tar xf core/cfengine-$CURR_VERSION.tar.gz
cd cfengine-$CURR_VERSION
- ./configure --with-tokyocabinet --disable-coverage --disable-shared
+ ./configure --with-tokyocabinet=/usr --disable-coverage --disable-shared
make check -j8
}
View
22 libpromises/Makefile.am
@@ -5,6 +5,8 @@ else
noinst_LTLIBRARIES = libpromises.la
endif
+EXTRA_DIST = extensions_template.c extensions_template.h enterprise_extension.sed math.pc
+
AM_CPPFLAGS = @CPPFLAGS@ -I$(srcdir)/../libutils -I $(srcdir)/../libcfnet \
-I$(srcdir)/../libenv $(ENTERPRISE_CPPFLAGS)
@@ -44,7 +46,7 @@ libpromises_la_SOURCES = \
dbm_tokyocab.c \
dir.h dir_priv.h \
enterprise_extension.c enterprise_extension.h \
- enterprise_stubs.c \
+ enterprise_stubs.c \
eval_context.c eval_context.h \
evalfunction.c evalfunction.h \
exec_tools.c exec_tools.h \
@@ -62,7 +64,7 @@ libpromises_la_SOURCES = \
item_lib.c item_lib.h \
iteration.c iteration.h \
keyring.c keyring.h\
- known_dirs.c known_dirs.h \
+ known_dirs.c known_dirs.h \
lastseen.c lastseen.h \
loading.c loading.h \
locks.c locks.h \
@@ -113,7 +115,9 @@ libpromises_la_SOURCES = \
variable.c variable.h \
verify_classes.c verify_classes.h \
verify_reports.c \
- verify_vars.c verify_vars.h
+ verify_vars.c verify_vars.h \
+ cf-windows-functions.h \
+ bootstrap.inc
if !NT
@@ -158,14 +162,15 @@ libpromises_la_SOURCES += \
endif
BUILT_SOURCES = cf3lex.c cf3parse.h cf3parse.c \
- $(srcdir)/enterprise_extension.c \
- $(srcdir)/enterprise_extension.h
+ enterprise_extension.c \
+ enterprise_extension.h
ENTERPRISE_EXTENSION_GENERATE = $(SED) -f $(srcdir)/enterprise_extension.sed $< > $@
ENTERPRISE_EXTENSION_MAKE = @if test -z "$(V)"; then echo " SED " $@; else echo "$(ENTERPRISE_EXTENSION_GENERATE)"; fi; $(ENTERPRISE_EXTENSION_GENERATE)
-$(srcdir)/enterprise_extension.c: extensions_template.c enterprise_extension.sed
+
+enterprise_extension.c: extensions_template.c enterprise_extension.sed
$(ENTERPRISE_EXTENSION_MAKE)
-$(srcdir)/enterprise_extension.h: extensions_template.h enterprise_extension.sed
+enterprise_extension.h: extensions_template.h enterprise_extension.sed
$(ENTERPRISE_EXTENSION_MAKE)
CLEANFILES = *.gcno *.gcda $(BUILT_SOURCES)
@@ -186,6 +191,5 @@ libpromises_la_DEPENDENCIES = ../libutils/libutils.la ../libcfnet/libcfnet.la \
../libutils/libutils.la:
$(MAKE) -C ../libutils $(AM_MAKEFLAGS) libutils.la
-# This should be run by hand to generate bootstrap.inc
-bootstrap-inc:
+bootstrap.inc:
perl ./text2cstring.pl failsafe.cf > bootstrap.inc
Please sign in to comment.
Something went wrong with that request. Please try again.