From d004a04f8ee5b24e9f5422a2dfd8fba81afca236 Mon Sep 17 00:00:00 2001 From: Mike Bordua Date: Tue, 12 Jul 1994 20:40:28 +0000 Subject: [PATCH] Committing so Matt Needs can work. --- src/libCom/Makefile.Unix | 27 +++++++++++++-------------- src/toolsComm/antelope/Makefile.Unix | 11 ++++------- src/toolsComm/flex/Makefile.Unix | 10 +++++----- 3 files changed, 22 insertions(+), 26 deletions(-) diff --git a/src/libCom/Makefile.Unix b/src/libCom/Makefile.Unix index f88ba6d9d..e31a889c6 100644 --- a/src/libCom/Makefile.Unix +++ b/src/libCom/Makefile.Unix @@ -1,23 +1,22 @@ EPICS = ../../.. include $(EPICS)/config/CONFIG -T_ARCH = sun4 - -USR_LDFLAGS = -lm USR_CFLAGS = -DACCESS_SECURITY -D_NO_PROTO CC = acc -Xs +CC = acc -Xt SRCS = \ arAccessLib.c arCSCheck.c arChanIO.c bfSubr.c bucketLib.c \ calcPerform.c cmdSubr.c cvtFast.c cvtNumbers.c ellLib.c \ - envSubr.c errMtst.c errSymLib.c errSymTbl.c ezsSockSubr.c fdmgr.c \ + envSubr.c errMtst.c errSymLib.c ezsSockSubr.c fdmgr.c \ freeListLib.c genSubr.c genTaskSubr.c gpHashLib.c helpSubr.c \ memDebugLib.c nextFieldSubr.c postfix.c sydSubr.c sydSubrCA.c \ - sydSubrCF.c sydSubrSSF.c tsSubr.c + sydSubrCF.c sydSubrSSF.c tsSubr.c $(OBDIR)/errSymTbl.c +OBJS = -OBJS = \ +LIBOBJS = \ $(OBDIR)/arAccessLib.o $(OBDIR)/arCSCheck.o $(OBDIR)/arChanIO.o \ $(OBDIR)/bfSubr.o $(OBDIR)/bucketLib.o \ $(OBDIR)/calcPerform.o $(OBDIR)/cmdSubr.o $(OBDIR)/cvtFast.o \ @@ -30,15 +29,15 @@ OBJS = \ $(OBDIR)/postfix.o $(OBDIR)/sydSubr.o $(OBDIR)/sydSubrCA.o \ $(OBDIR)/sydSubrCF.o $(OBDIR)/sydSubrSSF.o $(OBDIR)/tsSubr.o -LIB = libCom.a -LIBNAME = $(OBDIR)/libCom.a +LIBNAME = libCom.a -PROD = +depends: bld_errSym -all :: bld_errSym $(LIBNAME) $(PROD) +bld_errSym: $(OBDIR)/errSymTbl.c $(OBDIR)/errInc.o -bld_errSym: - $(EPICS_BASE)/tools/blderrSymTbl - -include $(EPICS)/config/RULES +$(OBDIR)/errSymTbl.c $(OBDIR)/errInc.o: + @/bin/rm -f errInc.o + @$(EPICS_BASE)/tools/blderrSymTbl + @/bin/mv errSymTbl.c errInc.o $(OBDIR) +include $(EPICS)/config/RULES.Unix diff --git a/src/toolsComm/antelope/Makefile.Unix b/src/toolsComm/antelope/Makefile.Unix index 0f1e5dabd..bf18e38c5 100644 --- a/src/toolsComm/antelope/Makefile.Unix +++ b/src/toolsComm/antelope/Makefile.Unix @@ -2,12 +2,9 @@ EPICS = ../../../.. include $(EPICS)/config/CONFIG -T_ARCH = sun4 - LDLIBS = -lm -s USR_CFLAGS = -D_NO_PROTO -#CC = acc -Xs CC = cc SRCS = \ @@ -15,14 +12,14 @@ SRCS = \ mkpar.c output.c reader.c skeleton.c symtab.c \ verbose.c warshall.c +LIBOBJS = + OBJS = \ $(OBDIR)/closure.o $(OBDIR)/error.o $(OBDIR)/lalr.o \ $(OBDIR)/lr0.o $(OBDIR)/main.o $(OBDIR)/mkpar.o \ $(OBDIR)/output.o $(OBDIR)/reader.o $(OBDIR)/skeleton.o \ $(OBDIR)/symtab.o $(OBDIR)/verbose.o $(OBDIR)/warshall.o -TARGET = $(OBDIR)/antelope +PROD = $(OBDIR)/antelope -all :: $(TARGET) - -include $(EPICS)/config/RULES +include $(EPICS)/config/RULES.Unix diff --git a/src/toolsComm/flex/Makefile.Unix b/src/toolsComm/flex/Makefile.Unix index 7dce904bf..de077a276 100644 --- a/src/toolsComm/flex/Makefile.Unix +++ b/src/toolsComm/flex/Makefile.Unix @@ -6,8 +6,6 @@ SKELETON_FILE=.epicsUnix/share/bin/flex.skel.static USR_CFLAGS = -DDEFAULT_SKELETON_FILE=\"$(SKELETON_FILE)\" -T_ARCH = sun4 - LDLIBS = -s CC = cc @@ -17,15 +15,17 @@ SRCS = \ misc.c nfa.c parse.c scan.c sym.c \ tblcmp.c yylex.c +LIBOBJS = + OBJS = \ $(OBDIR)/ccl.o $(OBDIR)/dfa.o $(OBDIR)/ecs.o \ $(OBDIR)/gen.o $(OBDIR)/main.o $(OBDIR)/misc.o \ $(OBDIR)/nfa.o $(OBDIR)/parse.o $(OBDIR)/scan.o \ $(OBDIR)/sym.o $(OBDIR)/tblcmp.o $(OBDIR)/yylex.o -TARGET = $(OBDIR)/e_flex +PROD = $(OBDIR)/e_flex -all :: parse.h parse.c $(TARGET) +all :: parse.h parse.c $(PROD) parse.h parse.c : parse.y rm -f parse.h parse.c @@ -34,4 +34,4 @@ parse.h parse.c : parse.y @mv y.tab.h parse.h -include $(EPICS)/config/RULES +include $(EPICS)/config/RULES.Unix