diff options
| author | Vincent Sanders <vince@kyllikki.org> | 2017-08-30 23:27:28 +0100 |
|---|---|---|
| committer | Vincent Sanders <vince@kyllikki.org> | 2017-08-30 23:27:28 +0100 |
| commit | f8cdbbce19b102fb958c56f628a4f76f7f3e5052 (patch) | |
| tree | 9cbb60896866145a528181d492982092ef60019e | |
| parent | b72b9d1f1fe2bd406311b4f43ee3f370011251e7 (diff) | |
| download | netsurf-f8cdbbce19b102fb958c56f628a4f76f7f3e5052.tar.gz netsurf-f8cdbbce19b102fb958c56f628a4f76f7f3e5052.tar.bz2 | |
slightly amend how user config is included
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | Makefile.defaults | 4 |
2 files changed, 5 insertions, 4 deletions
@@ -505,9 +505,12 @@ CXXWARNFLAGS := # C default warning flags CWARNFLAGS := -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -# Pull in the configuration +# Pull in the default configuration include Makefile.defaults +# Pull in the user configuration +-include Makefile.config + # libraries enabled by feature switch without pkgconfig file $(eval $(call feature_switch,JPEG,JPEG (libjpeg),-DWITH_JPEG,-ljpeg,-UWITH_JPEG,)) $(eval $(call feature_switch,HARU_PDF,PDF export (haru),-DWITH_PDF_EXPORT,-lhpdf -lpng,-UWITH_PDF_EXPORT,)) diff --git a/Makefile.defaults b/Makefile.defaults index 619b8db08..a3ccf871d 100644 --- a/Makefile.defaults +++ b/Makefile.defaults @@ -136,11 +136,9 @@ endif # ---------------------------------------------------------------------------- -# Include any local configuration +# Detect double inclusion # ---------------------------------------------------------------------------- ifneq ($(MAKEFILE_DEFAULTS_FINISHED),) $(error Makefile.defaults has been double-included. If you did something utterly brain-dead such as copying Makefile.defaults to Makefile.config then you deserve all the pain you can imagine. Do NOT do that. Why not read the comments at the top of Makefile.defaults. They are there to help you, you numpty) endif MAKEFILE_DEFAULTS_FINISHED=yes --include Makefile.config - |