Mercurial > hg > octave-lyh
changeset 16505:ff061068a66c
move dialog files to separate directory
* scripts/ui/errordlg.m, scripts/ui/helpdlg.m, scripts/ui/inputdlg.m,
scripts/ui/listdlg.m, scripts/ui/msgbox.m, scripts/ui/questdlg.m,
scripts/ui/warndlg.m: Move here from scripts/java.
* scripts/java/module.mk (java_FCN_FILES): Update list.
* scripts/ui/module.mk: New file.
* scripts/Makefile.am: Include it.
(ui/PKG_ADD, $(ui_GEN_FCN_FILES), ui/$(octave_dirstamp)): New targets.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Fri, 12 Apr 2013 14:51:51 -0400 |
| parents | 49b059bf27c7 |
| children | 8a4960f2c7c3 |
| files | scripts/Makefile.am scripts/java/errordlg.m scripts/java/helpdlg.m scripts/java/inputdlg.m scripts/java/listdlg.m scripts/java/module.mk scripts/java/msgbox.m scripts/java/questdlg.m scripts/java/warndlg.m scripts/ui/errordlg.m scripts/ui/helpdlg.m scripts/ui/inputdlg.m scripts/ui/listdlg.m scripts/ui/module.mk scripts/ui/msgbox.m scripts/ui/questdlg.m scripts/ui/warndlg.m |
| diffstat | 10 files changed, 26 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -74,6 +74,7 @@ include strings/module.mk include testfun/module.mk include time/module.mk +include ui/module.mk nobase_fcnfile_DATA = $(FCN_FILES) $(GEN_FCN_FILES) $(JAR_FILES) @@ -213,6 +214,10 @@ $(srcdir)/mk-pkg-add $(srcdir) $(time_FCN_FILES) -- $(time_GEN_FCN_FILES) > $@-t mv $@-t $@ +ui/PKG_ADD: $(ui_FCN_FILES) $(ui_GEN_FCN_FILES) ui/$(octave_dirstamp) mk-pkg-add + $(srcdir)/mk-pkg-add $(srcdir) $(ui_FCN_FILES) -- $(ui_GEN_FCN_FILES) > $@-t + mv $@-t $@ + $(@ftp_GEN_FCN_FILES): @ftp/$(octave_dirstamp) $(audio_GEN_FCN_FILES): audio/$(octave_dirstamp) $(deprecated_GEN_FCN_FILES): deprecated/$(octave_dirstamp) @@ -244,6 +249,7 @@ $(strings_GEN_FCN_FILES): strings/$(octave_dirstamp) $(testfun_GEN_FCN_FILES): testfun/$(octave_dirstamp) $(time_GEN_FCN_FILES): time/$(octave_dirstamp) +$(ui_GEN_FCN_FILES): ui/$(octave_dirstamp) @ftp/$(octave_dirstamp): $(MKDIR_P) @ftp @@ -338,6 +344,9 @@ time/$(octave_dirstamp): $(MKDIR_P) time : > time/$(octave_dirstamp) +ui/$(octave_dirstamp): + $(MKDIR_P) ui + : > ui/$(octave_dirstamp) if AMCOND_BUILD_DOCS @@ -464,4 +473,3 @@ if [ "x$(srcdir)" != "x." ]; then \ rm $(java_JAVA_IMAGES); \ fi -
--- a/scripts/java/module.mk +++ b/scripts/java/module.mk @@ -2,19 +2,12 @@ java_FCN_FILES = \ java/dlgtest.m \ - java/errordlg.m \ - java/helpdlg.m \ - java/inputdlg.m \ java/javaArray.m \ java/javaaddpath.m \ java/javaclasspath.m \ java/javamem.m \ java/javarmpath.m \ - java/listdlg.m \ - java/msgbox.m \ - java/questdlg.m \ - java/usejava.m \ - java/warndlg.m + java/usejava.m FCN_FILES += $(java_FCN_FILES)
new file mode 100644 --- /dev/null +++ b/scripts/ui/module.mk @@ -0,0 +1,16 @@ +FCN_FILE_DIRS += ui + +ui_FCN_FILES = \ + ui/errordlg.m \ + ui/helpdlg.m \ + ui/inputdlg.m \ + ui/listdlg.m \ + ui/msgbox.m \ + ui/questdlg.m \ + ui/warndlg.m + +FCN_FILES += $(ui_FCN_FILES) + +PKG_ADD_FILES += ui/PKG_ADD + +DIRSTAMP_FILES += ui/$(octave_dirstamp)