rearrangement

asn1c/tests/Makefile.am

@@ -11,12 +11,11 @@ else
 TESTS = check-*.c
 endif
 
-EXTRA_DIST = $(check_SCRIPTS) check-*.c* data-*/*.*
+EXTRA_DIST =			\
+	$(check_SCRIPTS)	\
+	check-*.c*		\
+	data-*/Makefile		\
+	data-*/*.*
 
 clean:
 	rm -rf test-*
-
-SUFFIXES = .xbr .ber
-
-.xbr.ber:
-	../enber $< > $@

asn1c/tests/Makefile.in

@@ -160,12 +160,15 @@ check_SCRIPTS = check-assembly.sh
 TESTS_ENVIRONMENT = CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" ./check-assembly.sh
 @CPLUSPLUS_FOUND_FALSE@TESTS = check-*.c
 @CPLUSPLUS_FOUND_TRUE@TESTS = check-*.c check-*.cc	## Include C++ test filed (.cc)
-EXTRA_DIST = $(check_SCRIPTS) check-*.c* data-*/*.*
-SUFFIXES = .xbr .ber
+EXTRA_DIST = \
+	$(check_SCRIPTS)	\
+	check-*.c*		\
+	data-*/Makefile		\
+	data-*/*.*
+
 all: all-am
 
 .SUFFIXES:
-.SUFFIXES: .xbr .ber
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -400,9 +403,6 @@ uninstall-am: uninstall-info-am
 
 clean:
 	rm -rf test-*
-
-.xbr.ber:
-	../enber $< > $@
 # 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.
 .NOEXPORT:

libasn1parser/Makefile.in

@@ -447,9 +447,9 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-rm -f asn1p_y.h
 	-rm -f asn1p_l.c
 	-rm -f asn1p_y.c
+	-rm -f asn1p_y.h
 clean: clean-am
 
 clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \