diff --git a/cde/lib/DtSvc/DtCodelibs/Makefile.am b/cde/lib/DtSvc/DtCodelibs/Makefile.am
index b011260e2..c7246c40a 100644
--- a/cde/lib/DtSvc/DtCodelibs/Makefile.am
+++ b/cde/lib/DtSvc/DtCodelibs/Makefile.am
@@ -5,15 +5,15 @@ noinst_LTLIBRARIES = libDtCodelibs.la
 libDtCodelibs_la_CXXFLAGS = -I../include -DMULTIBYTE
 
 if AIX
-libDtCodelibs_la_CXXFLAGS = -qlanglvl=compat
+libDtCodelibs_la_CXXFLAGS += -qlanglvl=compat
 endif
 
 if SOLARIS
-libDtCodelibs_la_CXXFLAGS = -DNO_REGCOMP
+libDtCodelibs_la_CXXFLAGS += -DNO_REGCOMP
 endif
 
 if HPUX
-libDtCodelibs_la_CXXFLAGS = -DMESSAGE_CAT
+libDtCodelibs_la_CXXFLAGS += -DMESSAGE_CAT
 endif
 
 libDtCodelibs_la_SOURCES = buf.C           filegen.C       mbschr.C \
diff --git a/cde/lib/DtSvc/DtXpm/Makefile.am b/cde/lib/DtSvc/DtXpm/Makefile.am
index b56bb034f..aeeb3c7b3 100644
--- a/cde/lib/DtSvc/DtXpm/Makefile.am
+++ b/cde/lib/DtSvc/DtXpm/Makefile.am
@@ -4,4 +4,4 @@ noinst_LTLIBRARIES = libDtXpm.la
 
 libDtXpm_CFLAGS = -I../include
 
-libDtXpm_SOURCES = xpm.c
+libDtXpm_la_SOURCES = xpm.c
diff --git a/cde/lib/csa/Makefile.am b/cde/lib/csa/Makefile.am
index 7f69cdf3a..2fe747d03 100644
--- a/cde/lib/csa/Makefile.am
+++ b/cde/lib/csa/Makefile.am
@@ -51,13 +51,6 @@ libcsa_la_SOURCES = agent.c         agent_xdr.c     api.c \
 		    table.c         updateattrs.c   xtclient.c \
 		    ansi_c.c
 
-SUFFIXES = .y
-
-.y.c:
-	$(YACC) -d $(YFLAGS) $<
-	sed -e s/yyparse/_DtCm_rule_parser/g -e s/yy/_DtCm_yy/g y.tab.c > $*.c
-	sed s/yy/_DtCm_yy/g y.tab.h > $*.h
-	$(RM) y.tab.c y.tab.h
 
 reparser.o:     reparser.c
 
@@ -82,4 +75,3 @@ agent.h:
 	rpcgen -h agent.x | $(SED) -f namechange1.sed | $(SED) -f namechange2.sed >> agent.h
 	cat agent.wrapend >> agent.h
 
-SUFFIXES = .x