Skip to content
Snippets Groups Projects
Commit 96deff86 authored by Lev Walkin's avatar Lev Walkin
Browse files

Newer way to address distributable scripts

parent ffd035e9
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
asn1c/Makefile.am
+ 1
− 2
View file @ 96deff86
...@@ -22,7 +22,6 @@ noinst_HEADERS = sys-common.h ...@@ -22,7 +22,6 @@ noinst_HEADERS = sys-common.h
dist_man1_MANS = asn1c.1 unber.1 enber.1 dist_man1_MANS = asn1c.1 unber.1 enber.1
check_SCRIPTS = check-xxber.sh check-parsing.sh dist_check_SCRIPTS = check-xxber.sh check-parsing.sh
TESTS = $(check_SCRIPTS) TESTS = $(check_SCRIPTS)
EXTRA_DIST = $(check_SCRIPTS)
CLEANFILES = .check-xxber.*.tmp .check-parsing.*.tmp CLEANFILES = .check-xxber.*.tmp .check-parsing.*.tmp
asn1c/Makefile.in
+ 4
− 5
View file @ 96deff86
...@@ -40,8 +40,8 @@ host_triplet = @host@ ...@@ -40,8 +40,8 @@ host_triplet = @host@
target_triplet = @target@ target_triplet = @target@
bin_PROGRAMS = asn1c$(EXEEXT) unber$(EXEEXT) enber$(EXEEXT) bin_PROGRAMS = asn1c$(EXEEXT) unber$(EXEEXT) enber$(EXEEXT)
subdir = asn1c subdir = asn1c
DIST_COMMON = README $(dist_man1_MANS) $(noinst_HEADERS) \ DIST_COMMON = README $(dist_check_SCRIPTS) $(dist_man1_MANS) \
$(srcdir)/Makefile.am $(srcdir)/Makefile.in $(noinst_HEADERS) $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.in am__aclocal_m4_deps = $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
...@@ -224,9 +224,8 @@ asn1c_LDADD = \ ...@@ -224,9 +224,8 @@ asn1c_LDADD = \
noinst_HEADERS = sys-common.h noinst_HEADERS = sys-common.h
dist_man1_MANS = asn1c.1 unber.1 enber.1 dist_man1_MANS = asn1c.1 unber.1 enber.1
check_SCRIPTS = check-xxber.sh check-parsing.sh dist_check_SCRIPTS = check-xxber.sh check-parsing.sh
TESTS = $(check_SCRIPTS) TESTS = $(check_SCRIPTS)
EXTRA_DIST = $(check_SCRIPTS)
CLEANFILES = .check-xxber.*.tmp .check-parsing.*.tmp CLEANFILES = .check-xxber.*.tmp .check-parsing.*.tmp
all: all-recursive all: all-recursive
...@@ -633,7 +632,7 @@ distdir: $(DISTFILES) ...@@ -633,7 +632,7 @@ distdir: $(DISTFILES)
fi; \ fi; \
done done
check-am: all-am check-am: all-am
$(MAKE) $(AM_MAKEFLAGS) $(check_SCRIPTS) $(MAKE) $(AM_MAKEFLAGS) $(dist_check_SCRIPTS)
$(MAKE) $(AM_MAKEFLAGS) check-TESTS $(MAKE) $(AM_MAKEFLAGS) check-TESTS
check: check-recursive check: check-recursive
all-am: Makefile $(PROGRAMS) $(MANS) $(HEADERS) all-am: Makefile $(PROGRAMS) $(MANS) $(HEADERS)
......
asn1c/tests/Makefile.am
+ 2
− 4
View file @ 96deff86
AM_CFLAGS = @ADD_CFLAGS@ AM_CFLAGS = @ADD_CFLAGS@
check_SCRIPTS = check-assembly.sh dist_check_SCRIPTS = check-assembly.sh
TESTS_ENVIRONMENT= CC="${CC}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" ./check-assembly.sh TESTS_ENVIRONMENT= CC="${CC}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" ./check-assembly.sh
TESTS = check-*.c TESTS = check-*.c
EXTRA_DIST = \ EXTRA_DIST = \
$(check_SCRIPTS) \
check-*.c* \ check-*.c* \
data-62 \ data-62 \
data-70 \ data-70 \
...@@ -18,5 +17,4 @@ EXTRA_DIST = \ ...@@ -18,5 +17,4 @@ EXTRA_DIST = \
dist-hook: dist-hook:
rm -rf `find $(distdir) -name .svn` rm -rf `find $(distdir) -name .svn`
clean: CLEANFILES = test-*
rm -rf test-*
asn1c/tests/Makefile.in
+ 8
− 7
View file @ 96deff86
...@@ -37,7 +37,8 @@ build_triplet = @build@ ...@@ -37,7 +37,8 @@ build_triplet = @build@
host_triplet = @host@ host_triplet = @host@
target_triplet = @target@ target_triplet = @target@
subdir = asn1c/tests subdir = asn1c/tests
DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in DIST_COMMON = README $(dist_check_SCRIPTS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.in am__aclocal_m4_deps = $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
...@@ -164,17 +165,17 @@ target_cpu = @target_cpu@ ...@@ -164,17 +165,17 @@ target_cpu = @target_cpu@
target_os = @target_os@ target_os = @target_os@
target_vendor = @target_vendor@ target_vendor = @target_vendor@
AM_CFLAGS = @ADD_CFLAGS@ AM_CFLAGS = @ADD_CFLAGS@
check_SCRIPTS = check-assembly.sh dist_check_SCRIPTS = check-assembly.sh
TESTS_ENVIRONMENT = CC="${CC}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" ./check-assembly.sh TESTS_ENVIRONMENT = CC="${CC}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" ./check-assembly.sh
TESTS = check-*.c TESTS = check-*.c
EXTRA_DIST = \ EXTRA_DIST = \
$(check_SCRIPTS) \
check-*.c* \ check-*.c* \
data-62 \ data-62 \
data-70 \ data-70 \
data-119 \ data-119 \
data-126 data-126
CLEANFILES = test-*
all: all-am all: all-am
.SUFFIXES: .SUFFIXES:
...@@ -328,7 +329,7 @@ distdir: $(DISTFILES) ...@@ -328,7 +329,7 @@ distdir: $(DISTFILES)
top_distdir="$(top_distdir)" distdir="$(distdir)" \ top_distdir="$(top_distdir)" distdir="$(distdir)" \
dist-hook dist-hook
check-am: all-am check-am: all-am
$(MAKE) $(AM_MAKEFLAGS) $(check_SCRIPTS) $(MAKE) $(AM_MAKEFLAGS) $(dist_check_SCRIPTS)
$(MAKE) $(AM_MAKEFLAGS) check-TESTS $(MAKE) $(AM_MAKEFLAGS) check-TESTS
check: check-am check: check-am
all-am: Makefile all-am: Makefile
...@@ -350,6 +351,7 @@ install-strip: ...@@ -350,6 +351,7 @@ install-strip:
mostlyclean-generic: mostlyclean-generic:
clean-generic: clean-generic:
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic: distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
...@@ -357,6 +359,8 @@ distclean-generic: ...@@ -357,6 +359,8 @@ distclean-generic:
maintainer-clean-generic: maintainer-clean-generic:
@echo "This command is intended for maintainers to use" @echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild." @echo "it deletes files that may require special tools to rebuild."
clean: clean-am
clean-am: clean-generic clean-libtool mostlyclean-am clean-am: clean-generic clean-libtool mostlyclean-am
distclean: distclean-am distclean: distclean-am
...@@ -414,9 +418,6 @@ uninstall-am: uninstall-info-am ...@@ -414,9 +418,6 @@ uninstall-am: uninstall-info-am
dist-hook: dist-hook:
rm -rf `find $(distdir) -name .svn` rm -rf `find $(distdir) -name .svn`
clean:
rm -rf test-*
# Tell versions [3.59,3.63) of GNU make to not export all variables. # Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded. # Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT: .NOEXPORT:
asn1c/webcgi/Makefile.am
+ 1
− 2
View file @ 96deff86
noinst_SCRIPTS = asn1c.cgi dist_noinst_SCRIPTS = asn1c.cgi
noinst_PROGRAMS = asn1c-suid-helper noinst_PROGRAMS = asn1c-suid-helper
EXTRA_DIST = asn1c.cgi
asn1c/webcgi/Makefile.in
+ 4
− 4
View file @ 96deff86
...@@ -40,7 +40,8 @@ host_triplet = @host@ ...@@ -40,7 +40,8 @@ host_triplet = @host@
target_triplet = @target@ target_triplet = @target@
noinst_PROGRAMS = asn1c-suid-helper$(EXEEXT) noinst_PROGRAMS = asn1c-suid-helper$(EXEEXT)
subdir = asn1c/webcgi subdir = asn1c/webcgi
DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in DIST_COMMON = README $(dist_noinst_SCRIPTS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.in am__aclocal_m4_deps = $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
...@@ -52,7 +53,7 @@ PROGRAMS = $(noinst_PROGRAMS) ...@@ -52,7 +53,7 @@ PROGRAMS = $(noinst_PROGRAMS)
asn1c_suid_helper_SOURCES = asn1c-suid-helper.c asn1c_suid_helper_SOURCES = asn1c-suid-helper.c
asn1c_suid_helper_OBJECTS = asn1c-suid-helper.$(OBJEXT) asn1c_suid_helper_OBJECTS = asn1c-suid-helper.$(OBJEXT)
asn1c_suid_helper_LDADD = $(LDADD) asn1c_suid_helper_LDADD = $(LDADD)
SCRIPTS = $(noinst_SCRIPTS) SCRIPTS = $(dist_noinst_SCRIPTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles am__depfiles_maybe = depfiles
...@@ -184,8 +185,7 @@ target_alias = @target_alias@ ...@@ -184,8 +185,7 @@ target_alias = @target_alias@
target_cpu = @target_cpu@ target_cpu = @target_cpu@
target_os = @target_os@ target_os = @target_os@
target_vendor = @target_vendor@ target_vendor = @target_vendor@
noinst_SCRIPTS = asn1c.cgi dist_noinst_SCRIPTS = asn1c.cgi
EXTRA_DIST = asn1c.cgi
all: all-am all: all-am
.SUFFIXES: .SUFFIXES:
......
examples/Makefile.am
+ 2
− 3
View file @ 96deff86
...@@ -35,9 +35,8 @@ EXTRA_DIST = $(srcdir)/rfc*.txt \ ...@@ -35,9 +35,8 @@ EXTRA_DIST = $(srcdir)/rfc*.txt \
$(srcdir)/sample.makefile.regen $(srcdir)/sample.makefile.regen
dist-hook: dist-hook:
rm -rf `find $(distdir) -name .svn` rm -f `find $(distdir) -name "*.core" -or -name ".tmp.*"`
rm -rf `find $(distdir) -name "*.core" -or -name ".tmp.*"` rm -f `find $(distdir) -name "*.[ch].??????"`
rm -rf `find $(distdir) -name "*.[ch].??????"`
CLEANFILES = $(ASN1_FILES_1) $(ASN1_FILES_2) $(ASN1_FILES_3) CLEANFILES = $(ASN1_FILES_1) $(ASN1_FILES_2) $(ASN1_FILES_3)
......
examples/Makefile.in
+ 2
− 3
View file @ 96deff86
...@@ -393,9 +393,8 @@ $(ASN1_FILES_3): crfc2asn1.pl $(ASN1_SOURCE_3) ...@@ -393,9 +393,8 @@ $(ASN1_FILES_3): crfc2asn1.pl $(ASN1_SOURCE_3)
./crfc2asn1.pl $(ASN1_SOURCE_3) ./crfc2asn1.pl $(ASN1_SOURCE_3)
dist-hook: dist-hook:
rm -rf `find $(distdir) -name .svn` rm -f `find $(distdir) -name "*.core" -or -name ".tmp.*"`
rm -rf `find $(distdir) -name "*.core" -or -name ".tmp.*"` rm -f `find $(distdir) -name "*.[ch].??????"`
rm -rf `find $(distdir) -name "*.[ch].??????"`
clean-local: clean-local:
for dir in sample.source.*; do (cd $$dir && make distclean); done for dir in sample.source.*; do (cd $$dir && make distclean); done
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment