X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/87278972ae64ef4c5eff110af1565b1988160fb4..7804af20a363ed8e94d6e700505870cb4f550730:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index c802b2d..469f962 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,10 +20,10 @@ AM_CPPFLAGS = -I$(top_builddir)/src -I$(top_srcdir)/src \
 MAINTAINERCLEANFILES = src/scan.c src/scan.h src/scan.stamp \
 	src/parse.c src/parse.h src/parse.stamp
 
-CLEANFILES = src/typenames.h src/validtypes.h src/errtab.h
+CLEANFILES = src/validtypes.h src/errtab.h
 
-EXTRA_DIST = m4/gnulib-cache.m4 src/types.lst src/typenames.sed \
-	src/validtypes.sed src/errors.lst src/strtab.sed \
+EXTRA_DIST = m4/gnulib-cache.m4 src/types.lst src/validtypes.sed \
+	src/errors.lst src/strtab.sed \
 	src/parse.stamp src/scan.stamp \
 	COPYING.WTFPL2
 
@@ -39,7 +39,8 @@ lib_LTLIBRARIES = libcdecl.la
 libcdecl_la_LDFLAGS = -no-undefined \
 	-export-symbols-regex '^cdecl_[[:lower:]]'
 libcdecl_la_SOURCES = src/scan.c src/parse.c src/parse-decl.c src/typemap.c \
-	src/output.c src/explain.c src/declare.c src/i18n.c src/error.c
+	src/output.c src/explain.c src/declare.c src/i18n.c src/error.c \
+	src/normalize.c
 libcdecl_la_LIBADD = libgnu.la $(LTLIBINTL) $(LTLIBTHREAD)
 $(libcdecl_la_OBJECTS): $(gnulib_headers)
 
@@ -51,21 +52,28 @@ $(cdecl99_OBJECTS): $(gnulib_headers)
 src/parse.lo: src/scan.h
 src/scan.lo: src/parse.h
 src/parse-decl.lo: src/scan.h src/parse.h
-src/typemap.lo: src/validtypes.h src/typenames.h
+src/typemap.lo: src/validtypes.h
 src/error.lo: src/errtab.h
+src/normalize.lo: src/ordspecs.h
+src/output.lo: src/namespecs.h
 
 src/validtypes.h: $(srcdir)/src/types.lst $(srcdir)/src/validtypes.sed
 	$(AM_V_GEN)sed -f $(srcdir)/src/validtypes.sed \
 		< $(srcdir)/src/types.lst > $@.tmp
 	$(AM_V_at)mv -f $@.tmp $@
 
-src/typenames.h: $(srcdir)/src/types.lst $(srcdir)/src/typenames.sed
-	$(AM_V_GEN)sed -f $(srcdir)/src/typenames.sed \
-		< $(srcdir)/src/types.lst > $@.tmp
-	$(AM_V_at)mv -f $@.tmp $@
+src/namespecs.h: $(srcdir)/src/specs.lst $(srcdir)/src/namespecs.sed
+	$(AM_V_GEN) sed -f $(srcdir)/src/namespecs.sed \
+		< $(srcdir)/src/specs.lst > $@.tmp
+	$(AM_V_at) mv -f $@.tmp $@
+
+src/ordspecs.h: $(srcdir)/src/specs.lst $(srcdir)/src/ordspecs.sed
+	$(AM_V_GEN) sed -f $(srcdir)/src/ordspecs.sed \
+		< $(srcdir)/src/specs.lst > $@.tmp
+	$(AM_V_at) mv -f $@.tmp $@
 
 src/errtab.h: $(srcdir)/src/errors.lst $(srcdir)/src/strtab.sed
-	$(AM_V_GEN)sed -nf $(srcdir)/src/strtab.sed \
+	$(AM_V_GEN)sed -f $(srcdir)/src/strtab.sed \
 		< $(srcdir)/src/errors.lst > $@.tmp
 	$(AM_V_at)mv -f $@.tmp $@
 
@@ -96,10 +104,10 @@ install-mo: $(MOFILES)
 		lang=`expr "$$mo" : '.*/\(.*\)\.mo' \| "$$mo" : '\(.*\)\.mo'`; \
 		test x"$$lang" = x"" && exit 1; \
 		inst="$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES"; \
-		set -x; \
-		$(MKDIR_P) "$$inst" || exit $$?; \
-		$(INSTALL_DATA) "$$mo" "$$inst/$(PACKAGE).mo" || exit $$?; \
-		set +x; \
+		(set -x; $(MKDIR_P) "$$inst") \
+			|| exit $$?; \
+		(set -x; $(INSTALL_DATA) "$$mo" "$$inst/$(PACKAGE).mo") \
+			|| exit $$?; \
 	done
 
 installdirs-local: installdirs-mo
@@ -108,9 +116,7 @@ installdirs-mo:
 		lang=`expr "$$mo" : '.*/\(.*\)\.mo' \| "$$mo" : '\(.*\)\.mo'`; \
 		test x"$$lang" = x"" && exit 1; \
 		inst="$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES"; \
-		set -x; \
-		$(MKDIR_P) "$$inst" || exit $$?; \
-		set +x; \
+		(set -x; $(MKDIR_P) "$$inst") || exit $$?; \
 	done
 
 uninstall-local: uninstall-mo
@@ -119,9 +125,7 @@ uninstall-mo:
 		lang=`expr "$$mo" : '.*/\(.*\)\.mo' \| "$$mo" : '\(.*\)\.mo'`; \
 		test x"$$lang" = x"" && exit 1; \
 		inst="$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES"; \
-		set -x; \
-		cd "$$inst" && rm -f '$(PACKAGE).mo'; \
-		set +x; \
+		(set -x; cd "$$inst" && rm -f '$(PACKAGE).mo'); \
 	done
 
 .PHONY: install-mo installdirs-mo uninstall-mo