From dd0daf1a3b75447fe5d1317e2e65e027d10e7697 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 29 Dec 2011 11:59:06 +0000 Subject: [PATCH] Rename preprocessor directory. --- .gitignore | 2 + APIs/Makefile.am | 2 +- Makefile.am | 2 +- configure.ac | 5 ++- generator-lib/.depend | 0 generator-lib/Makefile.am | 49 +++++++++++++++++++++++++ {preprocessor => generator-lib}/wrappi_types.ml | 0 {preprocessor => generator-macros}/.depend | 0 {preprocessor => generator-macros}/Makefile.am | 7 ++-- {preprocessor => generator-macros}/pa_wrap.ml | 0 10 files changed, 60 insertions(+), 7 deletions(-) create mode 100644 generator-lib/.depend create mode 100644 generator-lib/Makefile.am rename {preprocessor => generator-lib}/wrappi_types.ml (100%) rename {preprocessor => generator-macros}/.depend (100%) rename {preprocessor => generator-macros}/Makefile.am (88%) rename {preprocessor => generator-macros}/pa_wrap.ml (100%) diff --git a/.gitignore b/.gitignore index 892cb64..862ad54 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,8 @@ *.cmi *.cmo *.cmx +*.cma +*.cmxa Makefile Makefile.in /aclocal.m4 diff --git a/APIs/Makefile.am b/APIs/Makefile.am index deac8a9..0edf67d 100644 --- a/APIs/Makefile.am +++ b/APIs/Makefile.am @@ -18,7 +18,7 @@ OCAMLCFLAGS = -g -warn-error CDEFLMPSUVYZX OCAMLOPTFLAGS = $(OCAMLCFLAGS) -PP = -pp '$(CAMLP4O) ../preprocessor/pa_wrap.cmo -impl' +PP = -pp '$(CAMLP4O) ../generator-macros/pa_wrap.cmo -impl' #API_FILES = $(wildcard *.api) API_FILES = mkdir.api mknod.api diff --git a/Makefile.am b/Makefile.am index 8731aaf..adb1d65 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,7 +21,7 @@ ACLOCAL_AMFLAGS = -I m4 # camlp4-based preprocessor must be compiled first before we can # compile the rest of the generator. Hence the rather convoluted set # of subdirectories here. -SUBDIRS = preprocessor APIs generator +SUBDIRS = generator-lib generator-macros APIs generator # The C library. SUBDIRS += lib diff --git a/configure.ac b/configure.ac index 21832b1..fb2717b 100644 --- a/configure.ac +++ b/configure.ac @@ -59,6 +59,7 @@ AC_CONFIG_HEADERS([config.h]) AC_CONFIG_FILES([Makefile APIs/Makefile generator/Makefile - lib/Makefile - preprocessor/Makefile]) + generator-lib/Makefile + generator-macros/Makefile + lib/Makefile]) AC_OUTPUT diff --git a/generator-lib/.depend b/generator-lib/.depend new file mode 100644 index 0000000..e69de29 diff --git a/generator-lib/Makefile.am b/generator-lib/Makefile.am new file mode 100644 index 0000000..809965b --- /dev/null +++ b/generator-lib/Makefile.am @@ -0,0 +1,49 @@ +# wrappi +# Copyright (C) 2011 Red Hat Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +OCAMLCFLAGS = -g -warn-error CDEFLMPSUVYZX +OCAMLOPTFLAGS = $(OCAMLCFLAGS) + +OBJECTS = wrappi_types.cmo + +noinst_SCRIPTS = generator_lib.cma + +generator_lib.cma: $(OBJECTS) + $(OCAMLMKLIB) $^ -o generator_lib + +%.cmi: %.mli + $(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -c $< -o $@ +%.cmo: %.ml + $(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -c $< -o $@ +%.cmx: %.ml + $(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) -c $< -o $@ + +CLEANFILES = *.cmi *.cmo *.cmx *~ + +depend: .depend + +.depend: $(wildcard *.mli) $(wildcard *.ml) + rm -f $@ $@-t + $(OCAMLFIND) ocamldep $^ | \ + $(SED) -e 's/ *$$//' | \ + $(SED) -e :a -e '/ *\\$$/N; s/ *\\\n */ /; ta' | \ + LANG=C sort > $@-t + mv $@-t $@ + +include .depend + +SUFFIXES = .cmo .cmi .cmx .ml .mli .mll .mly diff --git a/preprocessor/wrappi_types.ml b/generator-lib/wrappi_types.ml similarity index 100% rename from preprocessor/wrappi_types.ml rename to generator-lib/wrappi_types.ml diff --git a/preprocessor/.depend b/generator-macros/.depend similarity index 100% rename from preprocessor/.depend rename to generator-macros/.depend diff --git a/preprocessor/Makefile.am b/generator-macros/Makefile.am similarity index 88% rename from preprocessor/Makefile.am rename to generator-macros/Makefile.am index f0e8e93..85cdaa8 100644 --- a/preprocessor/Makefile.am +++ b/generator-macros/Makefile.am @@ -20,10 +20,11 @@ OCAMLOPTFLAGS = $(OCAMLCFLAGS) noinst_SCRIPTS = pa_wrap.cmo -pa_wrap.cmo: pa_wrap.ml wrappi_types.cmo - $(OCAMLFIND) ocamlc -I +camlp4 dynlink.cma camlp4lib.cma \ +pa_wrap.cmo: pa_wrap.ml ../generator-lib/generator_lib.cma + $(OCAMLFIND) ocamlc -I +camlp4 -I ../generator-lib \ + dynlink.cma camlp4lib.cma generator_lib.cma \ -pp $(CAMLP4OF) \ - wrappi_types.cmo -c $< -o $@ + -c $< -o $@ %.cmi: %.mli $(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -c $< -o $@ diff --git a/preprocessor/pa_wrap.ml b/generator-macros/pa_wrap.ml similarity index 100% rename from preprocessor/pa_wrap.ml rename to generator-macros/pa_wrap.ml -- 1.8.3.1