epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Remove references to MAN and changed OBJS build.

Browse Source
This commit is contained in:
Janet B. Anderson
2000-02-04 14:57:30 +00:00
parent 8d6c6f7e1d
commit 3a74d9263b
4 changed files with 21 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
configure/CONFIG_COMMON
View File

@@ -43,7 +43,6 @@ INSTALL_LOCATION_BIN = $(INSTALL_LOCATION)/bin
INSTALL_INCLUDE = $(INSTALL_LOCATION)/include
INSTALL_DOC = $(INSTALL_LOCATION)/doc
INSTALL_HTML = $(INSTALL_LOCATION)/html
INSTALL_MAN = $(INSTALL_LOCATION)/man
INSTALL_TEMPLATES = $(INSTALL_LOCATION)/templates
INSTALL_DBD = $(INSTALL_LOCATION)/dbd
INSTALL_CONFIG = $(INSTALL_LOCATION)/configure
@@ -184,6 +183,10 @@ TARGET_LDLIBS = $($(basename $@)_LDLIBS) $($(basename $@)_LDLIBS_$(OS_CLASS))
TARGET_CPPFLAGS = $($(basename $@)_CPPFLAGS) $($(basename $@)_CPPFLAGS_$(OS_CLASS))
TARGET_SNCFLAGS = $($(basename $@)_SNCFLAGS) $($(basename $@)_SNCFLAGS_$(OS_CLASS))
#--------------------------------------------------
# Objs filename definition
OBJSNAME = $(addsuffix $(OBJ),$(OBJS))
#--------------------------------------------------
# Depends flag
DEPENDS_FLAG = $($(CPLUSPLUS)_DEPENDS_FLAG)
@@ -264,13 +267,6 @@ COMPILE.c = $(CC) $(CFLAGS) $(CPPFLAGS) -c $(SOURCE_FLAG)
COMPILE.cpp = $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(SOURCE_CXXFLAG)
#---------------------------------------------------------------
# Man pages
MANLIST = 1 2 3 4 5 6 7 8 9
MAN_DIRECTORY_TARGETS = $(foreach n, $(MANLIST),$(INSTALL_MAN)/man$(n))
#---------------------------------------------------------------
# Directory targets
@@ -292,12 +288,10 @@ INSTALL_DLL_LINK_LIBS+=$(DLL_LINK_LIBNAME_HOST:%=$(INSTALL_LIB)/%)
INSTALL_TCLLIBS=$(TCLLIBNAME:%=$(INSTALL_TCLLIB)/%)
INSTALL_TCLINDEX=$(TCLINDEX:%=$(INSTALL_TCLLIB)/%)
INSTALL_SCRIPTS = $(SCRIPTS:%= $(INSTALL_BIN)/%)
INSTALL_OBJS = $(OBJS:%= $(INSTALL_BIN)/%)
INSTALL_OBJS = $(OBJSNAME:%= $(INSTALL_BIN)/%)
INCREC +=$(RECTYPES) $(MENUS)
INSTALL_INCREC = $(INCREC:%= $(INSTALL_INCLUDE)/%)
INSTALL_MANS = $(foreach n, \
$(MANLIST), $(MAN$(n):%= $(INSTALL_MAN)/man$(n)/%))
INSTALL_DOCS = $(DOCS:%= $(INSTALL_DOC)/%)
INSTALL_HTMLS = $(HTMLS:%= $(INSTALL_HTML)/$(HTMLS_DIR)/%)

3
configure/CONFIG_SITE
View File

@@ -86,7 +86,8 @@ CXXCMPLR=STRICT
# NOTE solaris and sun4: If YES then LD_LIBRARY_PATH must
# include fullpathname $(INSTALL_LOCATION)/lib/$(HOST_ARCH)
# for both the base build and when invoking base executables
SHARED_LIBRARIES=NO
#SHARED_LIBRARIES=NO
SHARED_LIBRARIES=YES
# Build client objects statically ?
# must be either YES or NO

35
configure/RULES_BUILD
View File

@@ -153,9 +153,9 @@ build : inc
rebuild: clean install
inc: $(INSTALL_INC) $(INSTALL_OSINC)
inc: $(INSTALL_INC) $(INSTALL_OSINC) $(INSTALL_INCREC)
build: $(MENUS) $(RECTYPES) $(BPTS) $(OBJS) \
build: $(MENUS) $(RECTYPES) $(BPTS) $(OBJSNAME) \
$(LIBTARGETS) $(PROD) $(TESTPROD) $(TARGETS)
ifdef DBDEXPAND
@@ -166,13 +166,12 @@ buildInstall : \
$(INSTALL_SCRIPTS) $(INSTALL_PROD) \
$(INSTALL_TCLLIBS) $(INSTALL_TCLINDEX) \
$(INSTALL_OBJS) \
$(INSTALL_MANS) \
$(INSTALL_DOCS) \
$(INSTALL_HTMLS) \
$(INSTALL_TEMPLATE) \
$(INSTALL_CONFIGS) \
$(INSTALL_DBS) $(INSTALL_BPTS) \
$(INSTALL_DBDNAME) $(INSTALL_INCREC)
$(INSTALL_DBDNAME)
ifdef BIN_INSTALLS
buildInstall : binInstalls
@@ -316,7 +315,7 @@ endif # PROD defined
# VERY IMPORTANT !!!!
depends: $(LIBSRCS_IOC) $(LIBSRCS_HOST) $(SRCS) $(COND_PROD_SRCS)
$(RM) DEPENDS
@$(RM) DEPENDS
touch DEPENDS
$(DEPENDS_RULE)
@@ -373,7 +372,7 @@ depends: $(LIBSRCS_IOC) $(LIBSRCS_HOST) $(SRCS) $(COND_PROD_SRCS)
# WIN95/NT source browser
%.bsc: %.sbr
@echo "building source browser archive $@"
$(RM) $@
@$(RM) $@
$(BAFCMD) $<
#
@@ -446,29 +445,29 @@ $(INSTALL_DBD)/%: ../%
@$(INSTALL) -d -m 644 $< $(INSTALL_DBD)
%Record.h: %Record.dbd
$(RM) $@
@$(RM) $@
$(EPICS_BASE)/bin/$(HOST_ARCH)/dbToRecordtypeH$(HOSTEXE) \
$(DBDFLAGS) $<
%Record.h: ../%Record.dbd
$(RM) $@
@$(RM) $@
$(EPICS_BASE)/bin/$(HOST_ARCH)/dbToRecordtypeH$(HOSTEXE) \
$(DBDFLAGS) $<
menu%.h: menu%.dbd
$(RM) $@
@$(RM) $@
$(EPICS_BASE)/bin/$(HOST_ARCH)/dbToMenuH$(HOSTEXE) $<
menu%.h: ../menu%.dbd
$(RM) $@
@$(RM) $@
$(EPICS_BASE)/bin/$(HOST_ARCH)/dbToMenuH$(HOSTEXE) $<
bpt%.dbd: bpt%.data
$(RM) $@
@$(RM) $@
$(EPICS_BASE)/bin/$(HOST_ARCH)/makeBpt$(HOSTEXE) $<
bpt%.dbd: ../bpt%.data
$(RM) $@
@$(RM) $@
$(EPICS_BASE)/bin/$(HOST_ARCH)/makeBpt$(HOSTEXE) $<
ifdef DBDEXPAND
@@ -499,7 +498,7 @@ endif
# rule for lib (archive of object files) creation
$(LIBNAME_IOC): $(LIBOBJS_IOC)
$(RM) $@
@$(RM) $@
$(ARCMD) $(LIBOBJS_IOC)
ifneq ($(RANLIB)xx,xx)
$(RANLIB) $@;
@@ -510,7 +509,7 @@ $(DLL_LINK_LIBNAME_IOC) $(SHRLIBNAME_IOC): $(LIBOBJS_IOC)
# rule for lib (archive of object files) creation
$(LIBNAME_HOST): $(LIBOBJS_HOST)
$(RM) $@
@$(RM) $@
$(ARCMD) $(LIBOBJS_HOST)
ifneq ($(RANLIB)xx,xx)
$(RANLIB) $@;
@@ -573,14 +572,6 @@ $(INSTALL_CONFIG)/%: ../%
@echo "Installing config file $@"
@$(INSTALL) -d -m 644 $< $(@D)
$(addsuffix /%,$(MAN_DIRECTORY_TARGETS)) : %
@echo "Installing man file $@"
@$(INSTALL) -d -m 644 $< $(@D)
$(addsuffix /%,$(MAN_DIRECTORY_TARGETS)) : ../%
@echo "Installing man file $@"
@$(INSTALL) -d -m 644 $< $(@D)
$(INSTALL_INCLUDE)/os/$(OS_CLASS)/% : %
@echo "Installing os dependent include file $@"
@$(INSTALL) -d -m 644 $< $(@D)

2
configure/RULES_TOP
View File

@@ -20,7 +20,7 @@ distclean: clean uninstall
uninstall: $(addprefix uninstall$(DIVIDER),$(BUILD_ARCHS))
@$(RMDIR) rec.bak rec
@$(RMDIR) $(INSTALL_DBD) $(INSTALL_MAN) $(INSTALL_INCLUDE) $(INSTALL_DOC)\
@$(RMDIR) $(INSTALL_DBD) $(INSTALL_INCLUDE) $(INSTALL_DOC)\
$(INSTALL_HTML) $(INSTALL_JAVA) $(INSTALL_TEMPLATES)
@$(MAKE) -f Makefile cleandirs