X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=generator-lib%2FMakefile.am;h=f502f2d09a41f20ca4b539942dc6919c292156ff;hb=6d0ffdb7821c34fb807ddd277c216a050a479284;hp=809965b6b352436c11be506e4c638b00fb6de15a;hpb=dd0daf1a3b75447fe5d1317e2e65e027d10e7697;p=wrappi.git

diff --git a/generator-lib/Makefile.am b/generator-lib/Makefile.am
index 809965b..f502f2d 100644
--- a/generator-lib/Makefile.am
+++ b/generator-lib/Makefile.am
@@ -15,15 +15,34 @@
 # 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
+OCAMLPACKAGES = -package unix,camlp4.lib
+
+OCAMLCFLAGS = \
+	-g -warn-error CDEFLMPSUVYZX \
+	$(OCAMLPACKAGES)
 OCAMLOPTFLAGS = $(OCAMLCFLAGS)
 
-OBJECTS = wrappi_types.cmo
+# In alphabetical order.
+SOURCES = \
+	config.ml \
+	wrappi_accumulator.mli \
+	wrappi_accumulator.ml \
+	wrappi_types.mli \
+	wrappi_types.ml \
+	wrappi_utils.mli \
+	wrappi_utils.ml
+
+# In dependency order.
+OBJECTS = \
+	config.cmo \
+	wrappi_utils.cmo \
+	wrappi_types.cmo \
+	wrappi_accumulator.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 +51,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/ *$$//' | \