Merge pull request #51 from shindere/remove-c-headers

Stop generating C headers

Author: shindere

.gitignore

@@ -28,8 +28,7 @@ _build/
 /config.status
 /config.sub
 /stamp-h1
-/config.h
 *.so
 /stdcompat__stubs.c
-/stdcompat.h
 /stdcompat__domain.mli.in
+/stdcompat_tests

Makefile.am

@@ -81,6 +81,8 @@ MODULES = stdcompat__init.ml stdcompat__root.ml \
 	stdcompat__unit.ml \
 	stdcompat__stdlib.ml stdcompat.ml
 
+OBJEXT := @OBJEXT@
+
 # From https://github.com/fdopen/opam-repository-mingw/commit/3b4c52e17cfae96cfbf5120b60b8c2bbf5aad252
 # We prefer DLLEXT to conform with EXEEXT and OBJEXT
 DLLEXT := $(shell ocamlc -config | awk -F '[\t\r ]+' '/^ext_dll:/ {print $$2}')
@@ -91,7 +93,7 @@ LIBEXT := $(shell ocamlc -config | awk -F '[\t\r ]+' '/^ext_lib:/ {print $$2}')
 MODULES_native = stdcompat__native.ml $(MODULES)
 
 mypkg_SCRIPTS = META $(MODULES_native) $(MODULES_native:.ml=.cmi) \
-	libstdcompat__stubs$(LIBEXT) stdcompat.h
+	libstdcompat__stubs$(LIBEXT)
 
 if OCAML_SUPPORTS_BYTECODE
 mypkg_SCRIPTS += stdcompat.cma

Makefile.config.in

@@ -105,12 +105,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES = META stdcompat__hashtbl_ext.mli \
 	stdcompat__hashtbl_ext.ml stdcompat__init.mli \
 	stdcompat__init.ml stdcompat__root.mli stdcompat__root.ml \
 	stdcompat__tools.mli stdcompat__tools.ml stdcompat_tests.ml \
-	stdcompat.h stdcompat__stubs.c stdcompat__pervasives_s.mli \
+	stdcompat__stubs.c stdcompat__pervasives_s.mli \
 	stdcompat__arg_s.mli stdcompat__array_s.mli \
 	stdcompat__arrayLabels_s.mli stdcompat__atomic_s.mli \
 	stdcompat__bool_s.mli stdcompat__buffer_s.mli \
@@ -245,27 +244,8 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) \
-	config.h.in
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items[$$0] = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
-AM_RECURSIVE_TARGETS = cscope
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 am__DIST_COMMON = $(srcdir)/META.in $(srcdir)/Makefile.in \
-	$(srcdir)/config.h.in $(srcdir)/stdcompat.h.in \
 	$(srcdir)/stdcompat.ml.in $(srcdir)/stdcompat.mli.in \
 	$(srcdir)/stdcompat__arg.ml.in $(srcdir)/stdcompat__arg.mli.in \
 	$(srcdir)/stdcompat__arg_s.mli.in \
@@ -499,12 +479,7 @@ BEGIN_WITH_FLAMBDA2 = @BEGIN_WITH_FLAMBDA2@
 BEGIN_WITH_MAGIC = @BEGIN_WITH_MAGIC@
 BEGIN_WITH_UNIX = @BEGIN_WITH_UNIX@
 BEGIN_WITH_WIN32 = @BEGIN_WITH_WIN32@
-BIG_ENDIAN = @BIG_ENDIAN@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
 CMAX = @CMAX@
-CPPFLAGS = @CPPFLAGS@
 CSCOPE = @CSCOPE@
 CTAGS = @CTAGS@
 CYGPATH_W = @CYGPATH_W@
@@ -629,7 +604,6 @@ C_END_WITH_MAGIC = @C_END_WITH_MAGIC@
 C_END_WITH_UNIX = @C_END_WITH_UNIX@
 C_END_WITH_WIN32 = @C_END_WITH_WIN32@
 DEFS = @DEFS@
-DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -694,21 +668,19 @@ END_WITH_MAGIC = @END_WITH_MAGIC@
 END_WITH_UNIX = @END_WITH_UNIX@
 END_WITH_WIN32 = @END_WITH_WIN32@
 ETAGS = @ETAGS@
-EXEEXT = @EXEEXT@
 INCLUDE_DEPEND = @INCLUDE_DEPEND@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-OBJEXT = @OBJEXT@
+OBJEXT := @OBJEXT@
 OCAML = @OCAML@
 OCAMLBEST = @OCAMLBEST@
 OCAMLC = @OCAMLC@
@@ -744,10 +716,7 @@ abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-am__include = @am__include@
 am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
 am__rm_f_notfound = @am__rm_f_notfound@
 am__tar = @am__tar@
 am__untar = @am__untar@
@@ -878,8 +847,8 @@ DLLEXT := $(shell ocamlc -config | awk -F '[\t\r ]+' '/^ext_dll:/ {print $$2}')
 LIBEXT := $(shell ocamlc -config | awk -F '[\t\r ]+' '/^ext_lib:/ {print $$2}')
 MODULES_native = stdcompat__native.ml $(MODULES)
 mypkg_SCRIPTS = META $(MODULES_native) $(MODULES_native:.ml=.cmi) \
-	libstdcompat__stubs$(LIBEXT) stdcompat.h $(am__append_1) \
-	$(am__append_2) $(am__append_3) $(am__append_5)
+	libstdcompat__stubs$(LIBEXT) $(am__append_1) $(am__append_2) \
+	$(am__append_3) $(am__append_5)
 @OCAML_SUPPORTS_BYTECODE_TRUE@BEST_SUFFIX := .cmo
 @OCAML_SUPPORTS_NATIVE_TRUE@BEST_SUFFIX := .cmx
 PACKAGES = 
@@ -894,8 +863,7 @@ CLEANFILES = *.cmi *.cmo *.cmx *.cmt *.cmti *.$(OBJEXT) *$(LIBEXT) stdcompat.cma
 	stdcompat.cmxa stdcompat__native.ml dllstdcompat__stubs$(DLLEXT) \
 	stdcompat.cmxs $(STDCOMPAT_TESTS_EXE) $(bin_SCRIPTS) .depend
 
-all: config.h
-	$(MAKE) $(AM_MAKEFLAGS) all-am
+all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .ml .mli .cmi .cmo .cmx .cmxa .cmxs .cmt
@@ -932,21 +900,6 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 $(am__aclocal_m4_deps):
-
-config.h: stamp-h1
-	@test -f $@ || rm -f stamp-h1
-	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
-
-stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
-	$(AM_V_at)rm -f stamp-h1
-	$(AM_V_GEN)cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
-	$(AM_V_GEN)($(am__cd) $(top_srcdir) && $(AUTOHEADER))
-	$(AM_V_at)rm -f stamp-h1
-	$(AM_V_at)touch $@
-
-distclean-hdr:
-	-rm -f config.h stamp-h1
 META: $(top_builddir)/config.status $(srcdir)/META.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 stdcompat__hashtbl_ext.mli: $(top_builddir)/config.status $(srcdir)/stdcompat__hashtbl_ext.mli.in
@@ -967,8 +920,6 @@ stdcompat__tools.ml: $(top_builddir)/config.status $(srcdir)/stdcompat__tools.ml
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 stdcompat_tests.ml: $(top_builddir)/config.status $(srcdir)/stdcompat_tests.ml.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
-stdcompat.h: $(top_builddir)/config.status $(srcdir)/stdcompat.h.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
 stdcompat__stubs.c: $(top_builddir)/config.status $(srcdir)/stdcompat__stubs.c.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 stdcompat__pervasives_s.mli: $(top_builddir)/config.status $(srcdir)/stdcompat__pervasives_s.mli.in
@@ -1386,65 +1337,12 @@ uninstall-mypkgSCRIPTS:
 	files=`for p in $$list; do echo "$$p"; done | \
 	       sed -e 's,.*/,,;$(transform)'`; \
 	dir='$(DESTDIR)$(mypkgdir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
 
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-am
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	set x; \
-	here=`pwd`; \
-	$(am__define_uniq_tagged_files); \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: ctags-am
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-cscope: cscope.files
-	test ! -s cscope.files \
-	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
-clean-cscope:
-	-rm -f cscope.files
-cscope.files: clean-cscope cscopelist
-cscopelist: cscopelist-am
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
+ctags CTAGS:
+
+cscope cscopelist:
 
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
 distdir: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
@@ -1619,7 +1517,7 @@ distcleancheck: distclean
 	       exit 1; } >&2
 check-am: all-am
 check: check-am
-all-am: Makefile $(SCRIPTS) config.h
+all-am: Makefile $(SCRIPTS)
 installdirs:
 	for dir in "$(DESTDIR)$(mypkgdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
@@ -1662,7 +1560,7 @@ clean-am: clean-generic mostlyclean-am
 distclean: distclean-am
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-hdr distclean-tags
+distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
@@ -1725,22 +1623,21 @@ ps-am:
 
 uninstall-am: uninstall-mypkgSCRIPTS
 
-.MAKE: all install-am install-exec-am install-strip
-
-.PHONY: CTAGS GTAGS TAGS all all-am am--refresh check check-am clean \
-	clean-cscope clean-generic cscope cscopelist-am ctags ctags-am \
-	dist dist-all dist-bzip2 dist-gzip dist-lzip dist-shar \
-	dist-tarZ dist-xz dist-zip dist-zstd distcheck distclean \
-	distclean-generic distclean-hdr distclean-tags distcleancheck \
-	distdir distuninstallcheck dvi dvi-am html html-am info \
-	info-am install install-am install-data install-data-am \
-	install-dvi install-dvi-am install-exec install-exec-am \
-	install-exec-hook install-html install-html-am install-info \
-	install-info-am install-man install-mypkgSCRIPTS install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
+.MAKE: install-am install-exec-am install-strip
+
+.PHONY: all all-am am--refresh check check-am clean clean-generic \
+	cscopelist-am ctags-am dist dist-all dist-bzip2 dist-gzip \
+	dist-lzip dist-shar dist-tarZ dist-xz dist-zip dist-zstd \
+	distcheck distclean distclean-generic distcleancheck distdir \
+	distuninstallcheck dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-exec-hook \
+	install-html install-html-am install-info install-info-am \
+	install-man install-mypkgSCRIPTS install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	pdf-am ps ps-am tags-am uninstall uninstall-am \
 	uninstall-mypkgSCRIPTS
 
 .PRECIOUS: Makefile