prettyfying

diff --git a/asn1c/Makefile.am b/asn1c/Makefile.am
index b883f62..21da616 100644
--- a/asn1c/Makefile.am
+++ b/asn1c/Makefile.am
@@ -8,13 +8,13 @@
 	-I${top_srcdir}/libasn1print	\
 	-I${top_srcdir}/libasn1fix	\
 	-I${top_srcdir}/skeletons	\
-	-DDATADIR=\"${pkgdatadir}\"
+	-DDATADIR=\"$(pkgdatadir)\"
 
 LDADD =	\
-	${top_builddir}/libasn1parser/libasn1parser.la	\
-	${top_builddir}/libasn1fix/libasn1fix.la	\
-	${top_builddir}/libasn1print/libasn1print.la	\
-	${top_builddir}/libasn1compiler/libasn1compiler.la
+	$(top_builddir)/libasn1parser/libasn1parser.la	\
+	$(top_builddir)/libasn1print/libasn1print.la	\
+	$(top_builddir)/libasn1fix/libasn1fix.la	\
+	$(top_builddir)/libasn1compiler/libasn1compiler.la
 
 asn1c_SOURCES = asn1c.c	\
 	tlv_decoder.c tlv_decoder.h
diff --git a/asn1c/Makefile.in b/asn1c/Makefile.in
index 311957c..5267aa3 100644
--- a/asn1c/Makefile.in
+++ b/asn1c/Makefile.in
@@ -56,10 +56,11 @@
 am_asn1c_OBJECTS = asn1c.$(OBJEXT) tlv_decoder.$(OBJEXT)
 asn1c_OBJECTS = $(am_asn1c_OBJECTS)
 asn1c_LDADD = $(LDADD)
-asn1c_DEPENDENCIES = ${top_builddir}/libasn1parser/libasn1parser.la \
-	${top_builddir}/libasn1fix/libasn1fix.la \
-	${top_builddir}/libasn1print/libasn1print.la \
-	${top_builddir}/libasn1compiler/libasn1compiler.la
+asn1c_DEPENDENCIES = $(top_builddir)/libasn1parser/libasn1parser.la \
+	$(top_builddir)/libasn1print/libasn1print.la \
+	$(top_builddir)/libasn1fix/libasn1fix.la \
+	$(top_builddir)/libasn1cnst/libasn1cnst.la \
+	$(top_builddir)/libasn1compiler/libasn1compiler.la
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -206,13 +207,14 @@
 	-I${top_srcdir}/libasn1print	\
 	-I${top_srcdir}/libasn1fix	\
 	-I${top_srcdir}/skeletons	\
-	-DDATADIR=\"${pkgdatadir}\"
+	-DDATADIR=\"$(pkgdatadir)\"
 
 LDADD = \
-	${top_builddir}/libasn1parser/libasn1parser.la	\
-	${top_builddir}/libasn1fix/libasn1fix.la	\
-	${top_builddir}/libasn1print/libasn1print.la	\
-	${top_builddir}/libasn1compiler/libasn1compiler.la
+	$(top_builddir)/libasn1parser/libasn1parser.la	\
+	$(top_builddir)/libasn1print/libasn1print.la	\
+	$(top_builddir)/libasn1fix/libasn1fix.la	\
+	$(top_builddir)/libasn1cnst/libasn1cnst.la	\
+	$(top_builddir)/libasn1compiler/libasn1compiler.la
 
 asn1c_SOURCES = asn1c.c	\
 	tlv_decoder.c tlv_decoder.h