Browse Source

[trac761] rename def file and add to makefile

Jelte Jansen 14 years ago
parent
commit
189f58f73f
3 changed files with 7 additions and 6 deletions
  1. 6 5
      src/bin/xfrin/Makefile.am
  2. 1 1
      src/bin/xfrin/xfrin.py.in
  3. 0 0
      src/bin/xfrin/xfrindef.mes

+ 6 - 5
src/bin/xfrin/Makefile.am

@@ -6,12 +6,13 @@ pkglibexec_SCRIPTS = b10-xfrin
 
 b10_xfrindir = $(pkgdatadir)
 b10_xfrin_DATA = xfrin.spec
+pyexec_DATA = xfrindef.py
 
-CLEANFILES = b10-xfrin xfrin.pyc xfrinlog.py
+CLEANFILES = b10-xfrin xfrin.pyc xfrinlog.py xfrindef.py xfrindef.pyc
 
 man_MANS = b10-xfrin.8
 EXTRA_DIST = $(man_MANS) b10-xfrin.xml
-EXTRA_DIST += xfrin.spec
+EXTRA_DIST += xfrin.spec xfrindef.mes
 
 if ENABLE_MAN
 
@@ -21,11 +22,11 @@ b10-xfrin.8: b10-xfrin.xml
 endif
 
 # Define rule to build logging source files from message file
-xfrinlog.py: xfrinlog.mes
-	$(top_builddir)/src/lib/log/compiler/message -p $(top_srcdir)/src/bin/xfrin/xfrinlog.mes
+xfrindef.py: xfrindef.mes
+	$(top_builddir)/src/lib/log/compiler/message -p $(top_srcdir)/src/bin/xfrin/xfrindef.mes
 
 # this is done here since configure.ac AC_OUTPUT doesn't expand exec_prefix
-b10-xfrin: xfrin.py xfrinlog.py
+b10-xfrin: xfrin.py xfrindef.py
 	$(SED) -e "s|@@PYTHONPATH@@|@pyexecdir@|" \
 	       -e "s|@@LOCALSTATEDIR@@|$(localstatedir)|" xfrin.py >$@
 	chmod a+x $@

+ 1 - 1
src/bin/xfrin/xfrin.py.in

@@ -29,7 +29,7 @@ from isc.config.ccsession import *
 from isc.notify import notify_out
 import isc.util.process
 import isc.net.parse
-from xfrinlog import *
+from xfrindef import *
 
 isc.log.init("b10-xfrin")
 logger = isc.log.Logger("b10-xfrin")

src/bin/xfrin/xfrinlog.mes → src/bin/xfrin/xfrindef.mes