Skip to content
GitLab
Commit 6da2d7b5 authored by Andreas Fenkart's avatar Andreas Fenkart
Browse files

makefile: introduce EXT4_FILES

parent 1427589b
master DSD-10135 DSD-10757 DSD-10933-dsm-power DSD-11217 MR_cleanup_autoconf MR_help-ui_sub_project MR_more_makefile_cleanup R2204 R2207 R2210 R2303 R2309 R2311 R2411 cherry-pick-73b3a13b cherry-pick-9b350561 cherry-pick-ad65607b cherry-pick-b59aa029 testing 1.19.11 1.19.11-beta01 1.19.10.1 1.19.10.1-beta01 1.19.10 1.19.9 1.19.9-beta03 1.19.9-beta02 1.19.9-beta01 1.19.8.1 1.19.8 1.19.8-beta03 1.19.8-beta02 1.19.8-beta01 1.19.7.1 1.19.7 1.19.7-beta07 1.19.7-beta06 1.19.7-beta05 1.19.7-beta04 1.19.7-beta03 1.19.7-beta02 1.19.7-beta01 1.19.6.3 1.19.6.2 1.19.6.1 1.19.6.1-beta01 1.19.6 1.19.6-beta03 1.19.6-beta02 1.19.6-beta01 1.19.5.1 1.19.5.1-beta02 1.19.5.1-beta01 1.19.5 1.19.5-beta03 1.19.5-beta02 1.19.5-beta01 1.19.4 1.19.4-beta04 1.19.4-beta03 1.19.4-beta02 1.19.4-beta01 1.19.3.1 1.19.3.1-beta01 1.19.3 1.19.3-beta06 1.19.3-beta05 1.19.3-beta04 1.19.3-beta03 1.19.3-beta02 1.19.3-beta01
2 merge requests!460Merge branch 'master' into testing,!457Mr more makefile cleanup
Pipeline #37843 passed with stages
in 1 minute and 38 seconds
Hide whitespace changes
Inline Side-by-side
Showing
with 3 additions and 2 deletions
+3 -2
Makefile.am
+ 3
− 2
View file @ 6da2d7b5
......@@ -63,16 +63,17 @@ else
JSMIN=$(JSMIN_TOOL)
endif
nobase_nodist_web_DATA += \
EXT4_FILES = \
./webroot/js/extjs/adapter/ext/ext-base.js \
./webroot/js/extjs/ext-all.js
else
nobase_nodist_web_DATA += \
EXT4_FILES = \
./webroot/js/extjs/adapter/ext/ext-base-debug.js \
./webroot/js/extjs/ext-all-debug.js
JSMIN=$(CAT)
endif
nobase_nodist_web_DATA += $(EXT4_FILES)
BUILT_SOURCES = $(GENERATED_FILES)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment