Revision e1235448 Makefile.am

b/Makefile.am
685 685
	src/Ganeti/Hs2Py/GenConstants.hs \
686 686
	src/Ganeti/Hs2Py/GenOpCodes.hs \
687 687
	src/Ganeti/Hs2Py/OpDoc.hs \
688
	src/Ganeti/HsConstants.hs \
689 688
	src/Ganeti/JQueue.hs \
690 689
	src/Ganeti/JSON.hs \
691 690
	src/Ganeti/Jobs.hs \
......
972 971
# the reason for this is because 'hs2py-constants' needs to generate
973 972
# Python code, and 'Ganeti.Constants' is generated by Python.
974 973
src/hs2py-constants: src/hs2py-constants.hs src/AutoConf.hs \
975
		     src/Ganeti/BasicTypes.hs src/Ganeti/ConstantUtils.hs \
974
		     src/Ganeti/BasicTypes.hs \
975
		     src/Ganeti/Constants.hs \
976
		     src/Ganeti/ConstantUtils.hs \
976 977
		     src/Ganeti/JSON.hs src/Ganeti/THH.hs \
977 978
		     src/Ganeti/Hs2Py/GenConstants.hs \
978 979
		     src/Ganeti/Hs2Py/ListConstants.hs \
979
		     src/Ganeti/HsConstants.hs \
980 980
		     src/Ganeti/PyValueInstances.hs \
981 981
		   | stamp-srclinks
982 982
	$(GHC) --make \
......
1737 1737
	sed -e "s/%ver%/$$VCSVER/" < $< > $@
1738 1738

  
1739 1739
src/Ganeti/Hs2Py/ListConstants.hs: src/Ganeti/Hs2Py/ListConstants.hs.in \
1740
				   src/Ganeti/HsConstants.hs \
1740
				   src/Ganeti/Constants.hs \
1741 1741
			         | stamp-directories
1742 1742
	@echo Generating $@
1743 1743
	@set -e; \
1744
## Extract constant names from 'HsConstants.hs' by extracting the left
1744
## Extract constant names from 'Constants.hs' by extracting the left
1745 1745
## side of all lines containing an equal sign (i.e., '=') and
1746 1746
## prepending the apostrophe sign (i.e., "'").
1747 1747
##
......
1749 1749
##   adminstDown = ...
1750 1750
## becomes
1751 1751
##   'adminstDown
1752
	NAMES=$$(sed -e "/^--/ d" $(abs_top_srcdir)/src/Ganeti/HsConstants.hs |\
1752
	NAMES=$$(sed -e "/^--/ d" $(abs_top_srcdir)/src/Ganeti/Constants.hs |\
1753 1753
		 sed -n -e "/=/ s/\(.*\) =.*/    '\1:/g p"); \
1754 1754
	m4 -DPY_CONSTANT_NAMES="$$NAMES" $(abs_top_srcdir)/$< > $@
1755 1755

  

Also available in: Unified diff