summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2014-02-21 13:47:16 +0000
committerTom Hacohen <tom@stosb.com>2014-02-21 13:47:16 +0000
commitfd8a672600e3b7bec62ad41bf7b491b5978ffb69 (patch)
treef721967596c009a0a8b06b164324a866d05fe973
parent5a4989bddb0f151219262af3db6cf921e51e5a4e (diff)
Clean up eolian handling a bit. Still waiting for proper macros.
-rw-r--r--Makefile_Eolian_Helper.am (renamed from src/Makefile_Eolian_Helper.am)10
-rw-r--r--src/lib/Makefile.am16
2 files changed, 15 insertions, 11 deletions
diff --git a/src/Makefile_Eolian_Helper.am b/Makefile_Eolian_Helper.am
index 414f1fe..024ab89 100644
--- a/src/Makefile_Eolian_Helper.am
+++ b/Makefile_Eolian_Helper.am
@@ -7,3 +7,13 @@ endif
7AM_V_EOL = $(am__v_EOL_@AM_V@) 7AM_V_EOL = $(am__v_EOL_@AM_V@)
8am__v_EOL_ = $(am__v_EOL_@AM_DEFAULT_V@) 8am__v_EOL_ = $(am__v_EOL_@AM_DEFAULT_V@)
9am__v_EOL_0 = @echo " EOLIAN " $@; 9am__v_EOL_0 = @echo " EOLIAN " $@;
10
11#EOLIAN RELATED, THAT SHOULD BE PUT IN M4
12SUFFIXES = .eo .eo.c .eo.h
13
14.eo.eo.c:
15 $(AM_V_EOL)$(EOLIAN_GEN) $(EOLIAN_FLAGS) --gc -o $@ $<
16
17.eo.eo.h:
18 $(AM_V_EOL)$(EOLIAN_GEN) $(EOLIAN_FLAGS) --gh -o $@ $<
19#END OF EOLIAN RELATED
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 7976da5..612c20a 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -1,8 +1,12 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2 2
3include $(top_srcdir)/Makefile_Eolian_Helper.am
4
5# This will be replaced by proper eolian handling.
3EXTRA_DIST = elm_code.eo 6EXTRA_DIST = elm_code.eo
4 7
5include ../Makefile_Eolian_Helper.am 8BUILT_SOURCES = elm_code.eo.c elm_code.eo.h
9# End of eolian
6 10
7AM_CPPFLAGS = \ 11AM_CPPFLAGS = \
8-I$(top_srcdir)/src/lib \ 12-I$(top_srcdir)/src/lib \
@@ -16,16 +20,6 @@ lib_LTLIBRARIES = libelm_code.la
16includes_HEADERS = Elm_Code.h elm_code.eo.h 20includes_HEADERS = Elm_Code.h elm_code.eo.h
17includesdir = $(includedir)/elm_code-@VMAJ@ 21includesdir = $(includedir)/elm_code-@VMAJ@
18 22
19#EOLIAN RELATED, THAT SHOULD BE PUT IN M4
20SUFFIXES = .eo .eo.c .eo.h
21
22.eo.eo.c:
23 $(AM_V_EOL)$(EOLIAN_GEN) $(EOLIAN_FLAGS) --gc -o $@ $<
24
25.eo.eo.h:
26 $(AM_V_EOL)$(EOLIAN_GEN) $(EOLIAN_FLAGS) --gh -o $@ $<
27#END OF EOLIAN RELATED
28
29EOLIAN_FLAGS = \ 23EOLIAN_FLAGS = \
30 --eo1 \ 24 --eo1 \
31 -I ~/e/tools/eolian/example/eo \ 25 -I ~/e/tools/eolian/example/eo \