Skip to content

Commit

Permalink
Use '-include' when including the compatibility snippet
Browse files Browse the repository at this point in the history 
Fixes #1.
The Makefile snippet is missing on an uninstalled structure,
which is ok for some make targets like 'clean'.
  • Loading branch information
@ralphlange
ralphlange committed Aug 5, 2020
1 parent ca2ef4e commit 2b9b5cb
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ GTESTS += myTest
compatibility rules file at the end of your `Makefile`:

```makefile
include $(GTEST)/cfg/compat.RULES_BUILD
-include $(GTEST)/cfg/compat.RULES_BUILD
```

6. Run `make test-results`.
Expand Down
2 changes: 1 addition & 1 deletion sampleApp/mixdGtestEpicsSrc/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,4 +82,4 @@ TESTSPEC_RTEMS = sampleTestHarness.boot; epicsRunSampleTests
include $(TOP)/configure/RULES
#----------------------------------------
# ADD RULES AFTER THIS LINE
include $(GTEST)/cfg/compat.RULES_BUILD
-include $(GTEST)/cfg/compat.RULES_BUILD
2 changes: 1 addition & 1 deletion sampleApp/onlyGtestSrc/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ GTESTS += gsample3
include $(TOP)/configure/RULES
#----------------------------------------
# ADD RULES AFTER THIS LINE
include $(GTEST)/cfg/compat.RULES_BUILD
-include $(GTEST)/cfg/compat.RULES_BUILD

2 comments on commit 2b9b5cb

@anjohnson
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is one more place where you should add the - sign; the compat.RULES_BUILD file itself has a comment that shows how to use it.

@ralphlange
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Merci.

Please sign in to comment.