Ticket #39507

Patch for distcheck errors from Automake

Eröffnet am: 2019-08-25 12:31 Letztes Update: 2021-01-01 20:13

Auswertung:
(Anonym)
Verantwortlicher:
Typ:
Status:
Geschlossen
Komponente:
(Keine)
Priorität:
1 - Unterste
Schweregrad:
1 - Unterste
Lösung:
Gefixt
Datei:
Keine

Details

Running ./configure --disable-japanese and then make distcheck reported several problems and checking a created distribution against the original indicated some missing files in lib/. The patch below, computed by git diff, to several of Makefile.am files fixes some of them. Namely,

  • lib/edit/Makefile.am did not include q0dumpwitness.txt as a file to distribute
  • lib/file/Makefile.am did not include sname.txt as a file to distribute
  • lib/help/Makefile.am did not include faq.txt as a file to distribute
  • lib/pref/Makefile.am did not include graf-ne2.prf as a file to distribute
  • lib/xtra/music/Makefile.am did not include music.cfg as a file to distribute
  • lib/xtra/sound/Makefile.am did not include the individual sound files mentioned in sound.cfg as files to distribute
  • src/Makefile.am listed monster-process.h as a source file but it does not exist and assumes gcc-wrap is in the current directory which fails in a VPATH build
diff --git a/lib/edit/Makefile.am b/lib/edit/Makefile.am
index c26d9a34..03f027ef 100644
--- a/lib/edit/Makefile.am
+++ b/lib/edit/Makefile.am
@@ -9,8 +9,8 @@ angband_files = \
        q0000027.txt \
        q0000028.txt q00000ms.txt q000chao.txt q000dekn.txt \
        q000eric.txt q000lyeh.txt q000natu.txt q000sorc.txt \
-       q00water.txt q0clone0.txt q0fields.txt q0thief1.txt \
-       q0thief2.txt q0willow.txt q_info.txt q_oberon.txt \
+       q00water.txt q0clone0.txt q0dumpwitness.txt q0fields.txt \
+       q0thief1.txt q0thief2.txt q0willow.txt q_info.txt q_oberon.txt \
        q_pref.txt q_random.txt q_serpen.txt q_warg.txt \
        qdarkelf.txt qhaunted.txt r_info.txt t0000001.txt \
        t0000002.txt t0000003.txt t0000004.txt t0000005.txt \
diff --git a/lib/file/Makefile.am b/lib/file/Makefile.am
index e96b4973..59658f06 100644
--- a/lib/file/Makefile.am
+++ b/lib/file/Makefile.am
@@ -12,7 +12,7 @@ angband_files = \
        chainswd.txt dead.txt \
        death.txt elvish.txt error.txt mondeath.txt \
        monfear.txt monfrien.txt monspeak.txt news.txt \
-       rumors.txt seppuku.txt silly.txt timefun.txt \
+       rumors.txt seppuku.txt silly.txt sname.txt timefun.txt \
        timenorm.txt w_cursed.txt w_high.txt w_low.txt\
        w_med.txt
 
diff --git a/lib/help/Makefile.am b/lib/help/Makefile.am
index 49c859fe..a823db0b 100644
--- a/lib/help/Makefile.am
+++ b/lib/help/Makefile.am
@@ -4,7 +4,7 @@ angband_files = \
        attack.hlp attack.txt birth.hlp birth.txt \
        bldg.txt raceclas.hlp raceclas.txt command.hlp \
        command.txt commdesc.hlp commdesc.txt editor.txt \
-       defend.hlp defend.txt dungeon.hlp dungeon.txt \
+       defend.hlp defend.txt dungeon.hlp dungeon.txt faq.txt \
        gambling.txt general.hlp general.txt help.hlp helpinfo.txt \
        j_general.txt j_item1.txt j_item2.txt j_trans.txt \
        jattack.hlp jattack.txt jbirth.hlp jbirth.txt \
diff --git a/lib/pref/Makefile.am b/lib/pref/Makefile.am
index 34772e7e..efe41910 100644
--- a/lib/pref/Makefile.am
+++ b/lib/pref/Makefile.am
        font-ami.prf font-dos.prf font-ibm.prf font-mac.prf \
        font-mon.prf font-win.prf font-x11.prf font-xxx.prf \
        font.prf graf-ami.prf graf-dos.prf graf-gcu.prf \
-       graf-ibm.prf graf-mac.prf graf-new.prf graf-win.prf \
+       graf-ibm.prf graf-mac.prf graf-new.prf graf-ne2.prf graf-win.prf \
        graf-x11.prf graf-xaw.prf graf-xxx.prf graf.prf \
        pref-acn.prf pref-ami.prf pref-emx.prf pref-gcu.prf \
        pref-key.prf pref-mac.prf pref-opt.prf pref-win.prf \
diff --git a/lib/xtra/music/Makefile.am b/lib/xtra/music/Makefile.am
index 44812f78..c6991e70 100644
--- a/lib/xtra/music/Makefile.am
+++ b/lib/xtra/music/Makefile.am
@@ -1,4 +1,5 @@
 ## Makefile.am -- Process this file with automake to process Makefile.in
 
 EXTRA_DIST = \
-       delete.me
+       delete.me \
+       music.cfg
diff --git a/lib/xtra/sound/Makefile.am b/lib/xtra/sound/Makefile.am
index e8d86cdb..2b0097ba 100644
--- a/lib/xtra/sound/Makefile.am
+++ b/lib/xtra/sound/Makefile.am
@@ -1,4 +1,22 @@
 ## Makefile.am -- Process this file with automake to process Makefile.in
 
+sound_files = \
+       apple1-r.wav \
+       decision25r.wav \
+       drop1.wav \
+       enemy-advent1-r.wav \
+       sea-lion2-r.wav \
+       se_maoudamashii_battle07.wav \
+       se_maoudamashii_retro22.wav \
+       se_maoudamashii_se_drink01.wav \
+       se_maoudamashii_se_footstep01.wav \
+       sword-clash1-r.wav \
+       sword-drawn1-r.wav \
+       sword-gesture3-r.wav \
+       sword-slash3-r.wav
+
 EXTRA_DIST = \
-       sound.cfg
+       readme.txt \
+       sound.cfg \
+       $(sound_files) \
+       se_maoudamashii_voice_monster01.wav
diff --git a/src/Makefile.am b/src/Makefile.am
index 2443279c..e71ed939 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -37,7 +37,7 @@ hengband_SOURCES = \
        \
        monster.h \
        monsterrace-hook.c monsterrace-hook.h monster-process.c \
-       monster-process.h monster-status.c monster-status.h monster1.c \
+       monster-status.c monster-status.h monster1.c \
        monster2.c mspells1.c mspells2.c mspells3.c mspells4.c monster-spell.h \
        \
        mutation.h mutation.c \
@@ -95,7 +95,10 @@ EXTRA_hengband_SOURCES = \
        makefile.bcc makefile.std makefile.dos makefile.ibm \
        readdib.c wall.bmp
 
-COMPILE = ./gcc-wrap $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+EXTRA_DIST = \
+       gcc-wrap
+
+COMPILE = $(srcdir)/gcc-wrap $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 
 install-exec-hook:

Ticket-Verlauf (3/4 Historien)

2019-08-25 12:31 Aktualisiert von: None
  • New Ticket "Patch for distcheck errors from Automake" created
2019-09-11 00:32 Aktualisiert von: deskull
Kommentar

These problem will be fixed with Japanese refactoring. thanks.

2020-02-19 01:06 Aktualisiert von: deskull
  • Status Update from Offen to Geschlossen
2021-01-01 20:13 Aktualisiert von: deskull

Dateianhangliste

Keine Anhänge

Bearbeiten

You are not logged in. I you are not logged in, your comment will be treated as an anonymous post. » Anmelden