Skip to content

Commit

Permalink
build: Removal of the header file installation.
Browse files Browse the repository at this point in the history
  • Loading branch information
jerzyjamroz committed Dec 6, 2023
1 parent 31de1f4 commit 55198e9
Show file tree
Hide file tree
Showing 6 changed files with 41 additions and 40 deletions.
21 changes: 11 additions & 10 deletions evgMrmApp/src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,20 @@ include $(TOP)/configure/CONFIG
USR_INCLUDES += -I$(TOP)/mrmShared/src
USR_INCLUDES += -I$(TOP)/mrfCommon/src
USR_INCLUDES += -I$(TOP)/evrMrmApp/src
USR_INCLUDES += -I$(TOP)/evrApp/src

LIBRARY_IOC += evgmrm

INC += evgMrm.h
INC += evgRegMap.h
INC += evgAcTrig.h
INC += evgEvtClk.h
INC += evgTrigEvt.h
INC += evgMxc.h
INC += evgDbus.h
INC += evgInput.h
INC += evgOutput.h
INC += mrmevgseq.h
# INC += evgMrm.h
# INC += evgRegMap.h
# INC += evgAcTrig.h
# INC += evgEvtClk.h
# INC += evgTrigEvt.h
# INC += evgMxc.h
# INC += evgDbus.h
# INC += evgInput.h
# INC += evgOutput.h
# INC += mrmevgseq.h

SRC_DIRS += ../devSupport

Expand Down
20 changes: 10 additions & 10 deletions evrApp/src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,21 @@ LIBRARY = evr

SRC_DIRS += evr

USR_INCLUDES += -I$(TOP)/mrfCommon/src

DBD += evrSupport.dbd

INC += evr/pulser.h
INC += evr/output.h
INC += evr/delay.h
INC += evr/input.h
INC += evr/prescaler.h
INC += evr/evr.h
INC += evr/cml.h
# INC += evr/pulser.h
# INC += evr/output.h
# INC += evr/delay.h
# INC += evr/input.h
# INC += evr/prescaler.h
# INC += evr/evr.h
# INC += evr/cml.h

evr_SRCS += evr.cpp

INC += evrGTIF.h
# INC += evrGTIF.h
evr_SRCS += evrGTIF.cpp

evr_SRCS += devEvrStringIO.cpp
Expand Down Expand Up @@ -62,5 +64,3 @@ evrtest_LIBS += $(EPICS_BASE_IOC_LIBS)
include $(TOP)/configure/RULES
#----------------------------------------
# ADD RULES AFTER THIS LINE


3 changes: 2 additions & 1 deletion evrFRIBApp/src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ include $(TOP)/configure/CONFIG
#----------------------------------------
# ADD MACRO DEFINITIONS AFTER THIS LINE
#=============================
USR_INCLUDES += -I$(TOP)/evrApp/src
USR_INCLUDES += -I$(TOP)/mrfCommon/src

DBD += evrFRIBSupport.dbd

Expand All @@ -22,4 +24,3 @@ evrFRIB_LIBS += $(EPICS_BASE_IOC_LIBS)
include $(TOP)/configure/RULES
#----------------------------------------
# ADD RULES AFTER THIS LINE

3 changes: 1 addition & 2 deletions evrMrmApp/src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ include $(TOP)/configure/CONFIG

USR_INCLUDES += -I$(TOP)/mrmShared/src
USR_INCLUDES += -I$(TOP)/mrfCommon/src

USR_INCLUDES += -I$(TOP)/evrApp/src
#=============================
# Build the modular register map event receiver library

Expand Down Expand Up @@ -57,4 +57,3 @@ endif
include $(TOP)/configure/RULES
#----------------------------------------
# ADD RULES AFTER THIS LINE

26 changes: 13 additions & 13 deletions mrfCommon/src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,24 @@ MRF_VERSION = $(MRFIOC2_MAJOR_VERSION).$(MRFIOC2_MINOR_VERSION).$(MRFIOC2_MAINTE
#---------------------
# Install include files
#
INC += mrfBitOps.h
INC += mrfCommon.h # Common MRF event system constants & definitions
INC += mrfCommonIO.h # Common I/O access macros
INC += mrfFracSynth.h # Fractional Synthesizer routines
INC += linkoptions.h
INC += mrfcsr.h
# INC += mrfBitOps.h
# INC += mrfCommon.h # Common MRF event system constants & definitions
# INC += mrfCommonIO.h # Common I/O access macros
# INC += mrfFracSynth.h # Fractional Synthesizer routines
# INC += linkoptions.h
# INC += mrfcsr.h

INC += mrf/databuf.h
INC += mrf/object.h
# INC += mrf/databuf.h
# INC += mrf/object.h

INC += mrf/version.h

INC += devObj.h
# INC += devObj.h

INC += configurationInfo.h
INC += plx9030.h
INC += plx9056.h
INC += latticeEC30.h
# INC += configurationInfo.h
# INC += plx9030.h
# INC += plx9056.h
# INC += latticeEC30.h

TESTPROD_HOST += objectTest
objectTest_SRCS += objectTest.c
Expand Down
8 changes: 4 additions & 4 deletions mrmShared/src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ include $(TOP)/configure/CONFIG
USR_INCLUDES += -I$(TOP)/mrfCommon/src
USR_INCLUDES += -I$(TOP)/evrMrmApp/src

INC += mrmDataBufTx.h
INC += mrmSeq.h
INC += mrmpci.h
INC += sfp.h
# INC += mrmDataBufTx.h
# INC += mrmSeq.h
# INC += mrmpci.h
# INC += sfp.h

DBD += mrmShared.dbd

Expand Down

0 comments on commit 55198e9

Please sign in to comment.