Fix CLEANFILES.

[wrappi.git] / generator-lib / Makefile.am

diff --git a/generator-lib/Makefile.am b/generator-lib/Makefile.am
index 809965b..299ae04 100644 (file)
--- a/generator-lib/Makefile.am
+++ b/generator-lib/Makefile.am
@@ -15,15 +15,27 @@
 # 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
+OCAMLCFLAGS = -g -warn-error CDEFLMPSUVYZX -I +camlp4
 OCAMLOPTFLAGS = $(OCAMLCFLAGS)
 
-OBJECTS = wrappi_types.cmo
+# In alphabetical order.
+SOURCES = \
+       config.ml \
+       wrappi_globals.mli \
+       wrappi_globals.ml
+       wrappi_types.mli \
+       wrappi_types.ml
+
+# In dependency order.
+OBJECTS = \
+       config.cmo \
+       wrappi_types.cmo \
+       wrappi_globals.cmo
 
 noinst_SCRIPTS = generator_lib.cma
 
 generator_lib.cma: $(OBJECTS)
-       $(OCAMLMKLIB) $^ -o generator_lib
+       $(OCAMLFIND) ocamlc -a $^ -o generator_lib.cma
 
 %.cmi: %.mli
        $(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -c $< -o $@
@@ -32,11 +44,11 @@ generator_lib.cma: $(OBJECTS)
 %.cmx: %.ml
        $(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) -c $< -o $@
 
-CLEANFILES = *.cmi *.cmo *.cmx *~
+CLEANFILES = *.cmi *.cmo *.cmx *.cma *.cmxa *~
 
 depend: .depend
 
-.depend: $(wildcard *.mli) $(wildcard *.ml)
+.depend: $(SOURCES)
        rm -f $@ $@-t
        $(OCAMLFIND) ocamldep $^ | \
          $(SED) -e 's/ *$$//' | \