From 60215aa103bc944f9d72e164fe8945ea33d0aee2 Mon Sep 17 00:00:00 2001
From: Lev Walkin <vlm@lionet.info>
Date: Tue, 7 Sep 2004 06:44:55 +0000
Subject: [PATCH] automakefied
---
Makefile.in | 2 -
asn1c/Makefile.in | 2 -
asn1c/tests/Makefile.in | 4 +-
doc/Makefile.in | 2 -
libasn1compiler/Makefile.in | 139 +++++-------------------------------
libasn1fix/Makefile.in | 2 -
libasn1parser/Makefile.in | 2 -
libasn1print/Makefile.in | 2 -
skeletons/Makefile.in | 2 -
skeletons/asn_types.h | 2 +-
skeletons/tests/Makefile.in | 2 -
tests/Makefile.in | 2 -
12 files changed, 21 insertions(+), 142 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index cce91273..a7cea99a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -33,9 +33,7 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-build_triplet = @build@
host_triplet = @host@
-target_triplet = @target@
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
diff --git a/asn1c/Makefile.in b/asn1c/Makefile.in
index 244f501e..44d20fd1 100644
--- a/asn1c/Makefile.in
+++ b/asn1c/Makefile.in
@@ -36,9 +36,7 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-build_triplet = @build@
host_triplet = @host@
-target_triplet = @target@
bin_PROGRAMS = asn1c$(EXEEXT)
subdir = asn1c
DIST_COMMON = README $(dist_man1_MANS) $(srcdir)/Makefile.am \
diff --git a/asn1c/tests/Makefile.in b/asn1c/tests/Makefile.in
index b60721ab..2105fb9e 100644
--- a/asn1c/tests/Makefile.in
+++ b/asn1c/tests/Makefile.in
@@ -33,9 +33,7 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-build_triplet = @build@
host_triplet = @host@
-target_triplet = @target@
subdir = asn1c/tests
DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -163,7 +161,7 @@ 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*
+EXTRA_DIST = $(check_SCRIPTS) check-*.c*
all: all-am
.SUFFIXES:
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 93105837..c19ee0c7 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -34,9 +34,7 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-build_triplet = @build@
host_triplet = @host@
-target_triplet = @target@
subdir = doc
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff --git a/libasn1compiler/Makefile.in b/libasn1compiler/Makefile.in
index b427be97..73403835 100644
--- a/libasn1compiler/Makefile.in
+++ b/libasn1compiler/Makefile.in
@@ -14,7 +14,7 @@
@SET_MAKE@
-SOURCES = $(libasn1compiler_la_SOURCES) check_compiler.c
+SOURCES = $(libasn1compiler_la_SOURCES)
srcdir = @srcdir@
top_srcdir = @top_srcdir@
@@ -36,10 +36,7 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-build_triplet = @build@
host_triplet = @host@
-target_triplet = @target@
-check_PROGRAMS = check_compiler$(EXEEXT)
subdir = libasn1compiler
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -55,12 +52,6 @@ am_libasn1compiler_la_OBJECTS = asn1compiler.lo asn1c_misc.lo \
asn1c_out.lo asn1c_lang.lo asn1c_save.lo asn1c_C.lo \
asn1c_constraint.lo asn1c_compat.lo asn1c_fdeps.lo
libasn1compiler_la_OBJECTS = $(am_libasn1compiler_la_OBJECTS)
-check_compiler_SOURCES = check_compiler.c
-check_compiler_OBJECTS = check_compiler.$(OBJEXT)
-am__DEPENDENCIES_1 = libasn1compiler.la
-check_compiler_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(top_builddir)/libasn1parser/libasn1parser.la \
- $(top_builddir)/libasn1fix/libasn1fix.la
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@@ -72,8 +63,7 @@ am__depfiles_maybe = depfiles
@AMDEP_TRUE@ ./$(DEPDIR)/asn1c_misc.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/asn1c_out.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/asn1c_save.Plo \
-@AMDEP_TRUE@ ./$(DEPDIR)/asn1compiler.Plo \
-@AMDEP_TRUE@ ./$(DEPDIR)/check_compiler.Po
+@AMDEP_TRUE@ ./$(DEPDIR)/asn1compiler.Plo
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
@@ -82,8 +72,8 @@ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
CCLD = $(CC)
LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libasn1compiler_la_SOURCES) check_compiler.c
-DIST_SOURCES = $(libasn1compiler_la_SOURCES) check_compiler.c
+SOURCES = $(libasn1compiler_la_SOURCES)
+DIST_SOURCES = $(libasn1compiler_la_SOURCES)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -198,8 +188,8 @@ target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
AM_CPPFLAGS = \
- -I${top_srcdir}/libasn1parser \
- -I${top_srcdir}/libasn1fix
+ -I$(top_srcdir)/libasn1parser \
+ -I$(top_srcdir)/libasn1fix
noinst_LTLIBRARIES = libasn1compiler.la
libasn1compiler_la_LDFLAGS = -all-static
@@ -215,11 +205,6 @@ libasn1compiler_la_SOURCES = \
asn1c_fdeps.c asn1c_fdeps.h \
asn1c_internal.h
-TESTS = $(check_PROGRAMS)
-check_compiler_LDADD = $(noinst_LTLIBRARIES) \
- $(top_builddir)/libasn1parser/libasn1parser.la \
- $(top_builddir)/libasn1fix/libasn1fix.la
-
all: all-am
.SUFFIXES:
@@ -265,16 +250,6 @@ clean-noinstLTLIBRARIES:
libasn1compiler.la: $(libasn1compiler_la_OBJECTS) $(libasn1compiler_la_DEPENDENCIES)
$(LINK) $(libasn1compiler_la_LDFLAGS) $(libasn1compiler_la_OBJECTS) $(libasn1compiler_la_LIBADD) $(LIBS)
-clean-checkPROGRAMS:
- @list='$(check_PROGRAMS)'; for p in $$list; do \
- f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
- echo " rm -f $$p $$f"; \
- rm -f $$p $$f ; \
- done
-check_compiler$(EXEEXT): $(check_compiler_OBJECTS) $(check_compiler_DEPENDENCIES)
- @rm -f check_compiler$(EXEEXT)
- $(LINK) $(check_compiler_LDFLAGS) $(check_compiler_OBJECTS) $(check_compiler_LDADD) $(LIBS)
-
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -290,7 +265,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1c_out.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1c_save.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1compiler.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_compiler.Po@am__quote@
.c.o:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
@@ -374,79 +348,6 @@ GTAGS:
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-check-TESTS: $(TESTS)
- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
- srcdir=$(srcdir); export srcdir; \
- list='$(TESTS)'; \
- if test -n "$$list"; then \
- for tst in $$list; do \
- if test -f ./$$tst; then dir=./; \
- elif test -f $$tst; then dir=; \
- else dir="$(srcdir)/"; fi; \
- if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
- *" $$tst "*) \
- xpass=`expr $$xpass + 1`; \
- failed=`expr $$failed + 1`; \
- echo "XPASS: $$tst"; \
- ;; \
- *) \
- echo "PASS: $$tst"; \
- ;; \
- esac; \
- elif test $$? -ne 77; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
- *" $$tst "*) \
- xfail=`expr $$xfail + 1`; \
- echo "XFAIL: $$tst"; \
- ;; \
- *) \
- failed=`expr $$failed + 1`; \
- echo "FAIL: $$tst"; \
- ;; \
- esac; \
- else \
- skip=`expr $$skip + 1`; \
- echo "SKIP: $$tst"; \
- fi; \
- done; \
- if test "$$failed" -eq 0; then \
- if test "$$xfail" -eq 0; then \
- banner="All $$all tests passed"; \
- else \
- banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
- fi; \
- else \
- if test "$$xpass" -eq 0; then \
- banner="$$failed of $$all tests failed"; \
- else \
- banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
- fi; \
- fi; \
- dashes="$$banner"; \
- skipped=""; \
- if test "$$skip" -ne 0; then \
- skipped="($$skip tests were not run)"; \
- test `echo "$$skipped" | wc -c` -gt `echo "$$banner" | wc -c` && \
- dashes="$$skipped"; \
- fi; \
- report=""; \
- if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
- report="Please report to $(PACKAGE_BUGREPORT)"; \
- test `echo "$$report" | wc -c` -gt `echo "$$banner" | wc -c` && \
- dashes="$$report"; \
- fi; \
- dashes=`echo "$$dashes" | sed s/./=/g`; \
- echo "$$dashes"; \
- echo "$$banner"; \
- test -n "$$skipped" && echo "$$skipped"; \
- test -n "$$report" && echo "$$report"; \
- echo "$$dashes"; \
- test "$$failed" -eq 0; \
- else :; fi
-
distdir: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
@@ -475,8 +376,6 @@ distdir: $(DISTFILES)
fi; \
done
check-am: all-am
- $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
- $(MAKE) $(AM_MAKEFLAGS) check-TESTS
check: check-am
all-am: Makefile $(LTLIBRARIES)
installdirs:
@@ -506,8 +405,8 @@ maintainer-clean-generic:
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
-clean-am: clean-checkPROGRAMS clean-generic clean-libtool \
- clean-noinstLTLIBRARIES mostlyclean-am
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+ mostlyclean-am
distclean: distclean-am
-rm -rf ./$(DEPDIR)
@@ -555,17 +454,17 @@ ps-am:
uninstall-am: uninstall-info-am
-.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- clean-checkPROGRAMS clean-generic clean-libtool \
- clean-noinstLTLIBRARIES ctags distclean distclean-compile \
- distclean-generic distclean-libtool distclean-tags distdir dvi \
- dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-exec install-exec-am \
- install-info install-info-am install-man install-strip \
- installcheck installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-info-am
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+ distclean-compile distclean-generic distclean-libtool \
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-exec \
+ install-exec-am install-info install-info-am install-man \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags uninstall uninstall-am \
+ uninstall-info-am
# 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.
diff --git a/libasn1fix/Makefile.in b/libasn1fix/Makefile.in
index 3224cd8b..24a1b21f 100644
--- a/libasn1fix/Makefile.in
+++ b/libasn1fix/Makefile.in
@@ -36,9 +36,7 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-build_triplet = @build@
host_triplet = @host@
-target_triplet = @target@
check_PROGRAMS = check_fixer$(EXEEXT)
subdir = libasn1fix
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
diff --git a/libasn1parser/Makefile.in b/libasn1parser/Makefile.in
index 3afcae70..812ef45d 100644
--- a/libasn1parser/Makefile.in
+++ b/libasn1parser/Makefile.in
@@ -36,9 +36,7 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-build_triplet = @build@
host_triplet = @host@
-target_triplet = @target@
subdir = libasn1parser
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in asn1p_l.c \
asn1p_y.c asn1p_y.h
diff --git a/libasn1print/Makefile.in b/libasn1print/Makefile.in
index fce602b4..487d9dca 100644
--- a/libasn1print/Makefile.in
+++ b/libasn1print/Makefile.in
@@ -36,9 +36,7 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-build_triplet = @build@
host_triplet = @host@
-target_triplet = @target@
subdir = libasn1print
DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff --git a/skeletons/Makefile.in b/skeletons/Makefile.in
index ed4c177a..9216769b 100644
--- a/skeletons/Makefile.in
+++ b/skeletons/Makefile.in
@@ -34,9 +34,7 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-build_triplet = @build@
host_triplet = @host@
-target_triplet = @target@
subdir = skeletons
DIST_COMMON = README $(dist_pkgdata_DATA) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
diff --git a/skeletons/asn_types.h b/skeletons/asn_types.h
index a8bfb6d4..fa78f38b 100644
--- a/skeletons/asn_types.h
+++ b/skeletons/asn_types.h
@@ -15,7 +15,7 @@
#include <stdarg.h> /* For va_start */
#include <stddef.h> /* for offsetof and ptrdiff_t */
#ifndef WIN32
-#include <inttypes.h> /* C99 Standard specifies this file, for uintXX_t */
+#include <stdint.h> /* C99 Standard specifies this file, for uintXX_t */
#else
typedef unsigned char uint8_t;
typedef unsigned short int uint16_t;
diff --git a/skeletons/tests/Makefile.in b/skeletons/tests/Makefile.in
index 82dc6251..2f84112c 100644
--- a/skeletons/tests/Makefile.in
+++ b/skeletons/tests/Makefile.in
@@ -35,9 +35,7 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-build_triplet = @build@
host_triplet = @host@
-target_triplet = @target@
check_PROGRAMS = check-ber_tlv_tag$(EXEEXT) check-length$(EXEEXT) \
check-OIDs$(EXEEXT) check-GeneralizedTime$(EXEEXT) \
check-UTCTime$(EXEEXT) check-INTEGER$(EXEEXT)
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 17232e71..3e5a431a 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -33,9 +33,7 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-build_triplet = @build@
host_triplet = @host@
-target_triplet = @target@
subdir = tests
DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--
GitLab