diff options
| author | Petr Spacek <pspacek@redhat.com> | 2016-11-22 16:07:32 +0100 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2016-11-29 15:28:24 +0100 |
| commit | 89739a6c910461a3cac3abc1bf2ff162c7c5bc82 (patch) | |
| tree | 3f6c8a630bcebd2d6f33293cec6afa4237b193c4 | |
| parent | 6857de02f3a9c2d7e99e33863be3c65f71fa0d58 (diff) | |
| download | freeipa-89739a6c910461a3cac3abc1bf2ff162c7c5bc82.tar.gz freeipa-89739a6c910461a3cac3abc1bf2ff162c7c5bc82.tar.xz freeipa-89739a6c910461a3cac3abc1bf2ff162c7c5bc82.zip | |
Build: properly integrate loader.js into build system
AC_CONFIG_FILES in configure.ac works well only with Makefiles.
Other files have to be handled by Makefile.am so depedencies
are tracked properly.
https://fedorahosted.org/freeipa/ticket/6498
Reviewed-By: Martin Basti <mbasti@redhat.com>
| -rw-r--r-- | Makefile.am | 8 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | install/ui/src/libs/Makefile.am | 9 |
3 files changed, 15 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index c2826aea0..ad0ccd349 100644 --- a/Makefile.am +++ b/Makefile.am @@ -158,11 +158,15 @@ pylint: PYTHONPATH=$(top_srcdir) $(PYLINT) \ --rcfile=$(top_srcdir)/pylintrc $${FILES} -.PHONY: jslint jslint-ui jslint-ui-test jslint-html +.PHONY: jslint jslint-ui jslint-ui-test jslint-html \ + $(top_builddir)/install/ui/src/libs/loader.js jslint: jslint-ui jslint-ui-test jslint-html +$(top_builddir)/install/ui/src/libs/loader.js: + (cd $(top_builddir)/install/ui/src/libs && make loader.js) + # create temporary symlinks to allow jslint to find libs/loader.js -jslint-ui: +jslint-ui: $(top_builddir)/install/ui/src/libs/loader.js cd $(top_srcdir)/install/ui; \ $(MKDIR_P) js; \ rm -f js/libs; \ diff --git a/configure.ac b/configure.ac index 966699767..2712452ea 100644 --- a/configure.ac +++ b/configure.ac @@ -525,7 +525,6 @@ AC_CONFIG_FILES([ install/ui/css/Makefile install/ui/src/Makefile install/ui/src/libs/Makefile - install/ui/src/libs/loader.js install/ui/images/Makefile install/ui/build/Makefile install/ui/build/dojo/Makefile diff --git a/install/ui/src/libs/Makefile.am b/install/ui/src/libs/Makefile.am index f5a9e0ef2..1ee201b6b 100644 --- a/install/ui/src/libs/Makefile.am +++ b/install/ui/src/libs/Makefile.am @@ -16,6 +16,15 @@ app_DATA = \ nodist_app_DATA = \ loader.js +dist_noinst_DATA = \ + loader.js.in + EXTRA_DIST = \ $(app_DATA) \ $(NULL) + +loader.js: loader.js.in $(top_builddir)/$(CONFIG_STATUS) + $(AM_V_GEN)sed \ + -e 's|@API_VERSION[@]|$(API_VERSION)|g' \ + -e 's|@NUM_VERSION[@]|$(NUM_VERSION)|g' \ + $< > $@ |