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 /Makefile | |
| parent | b72b9d1f1fe2bd406311b4f43ee3f370011251e7 (diff) | |
| download | netsurf-f8cdbbce19b102fb958c56f628a4f76f7f3e5052.tar.gz netsurf-f8cdbbce19b102fb958c56f628a4f76f7f3e5052.tar.bz2 | |
slightly amend how user config is included
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 5 |
1 files changed, 4 insertions, 1 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,)) |