Changeset 1447

Show
Ignore:
Timestamp:
06/21/09 22:09:09 (15 months ago)
Author:
takkaria
Message:

Update the make system to a modified "ACBS" (with thanks to Aerdan).

Location:
trunk
Files:
2 added
3 removed
24 modified

Legend:

Unmodified
Added
Removed

  • trunk/Makefile

    r1125 r1447  
    11MKPATH=mk/ 
    2  
    3 include $(MKPATH)rules.mk 
    4 include $(MKPATH)objective.mk 
     2include $(MKPATH)buildsys.mk 
    53 
    64SUBDIRS = src lib 

  • trunk/configure.ac

    r1125 r1447  
    11dnl Process this file with autoconf to produce a configure script. 
    2 AC_INIT([Angband], [3.0.9], [bugs@rephial.org], [angband]) 
    3 AC_PREREQ([2.50]) 
     2AC_INIT([Angband], [3.1.x], [bugs@rephial.org], [angband]) 
     3AC_PREREQ([2.59]) 
    44 
    55AC_CONFIG_HEADER(src/autoconf.h) 
    6  
    7 dnl OMK bootstrap 
     6AC_CONFIG_SRCDIR([configure.ac]) 
     7 
    88AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME]) 
    99AC_SUBST([VERSION], [AC_PACKAGE_VERSION]) 
    … …  
    1212AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]) 
    1313 
    14 AC_ARG_WITH(setgid,       [  --with-setgid=NAME      install angband as group NAME]) 
    15 AC_ARG_WITH(private_dirs, [  --with-private-dirs     use private scorefiles/savefiles/datafiles], 
    16             [], [with_private_dirs=yes]) 
    17 AC_ARG_WITH(noinstall,    [  --with-noinstall        don't install globally at all]) 
    18  
    19 if test "x$with_setgid" != "xyes"; then 
    20         if test "x$with_setgid" != "x"; then 
    21                 wsetgid=yes 
    22                 with_private_dirs= 
    23         fi 
    24 fi 
    25 if test "x$with_noinstall" == "xyes"; then 
    26         with_private_dirs= 
    27 fi 
    28 #if test "x$with_segtid" == "xyes"; then 
    29 #       with_private_dirs= 
    30 #fi 
    31 if test "x$wsetgid$with_private_dirs$with_noinstall" != "xyes";  then 
     14AC_ARG_WITH(setgid, 
     15        [  --with-setgid=NAME      install angband as group NAME], 
     16        [wsetgid=yes], 
     17        [with_private_dirs=yes]) 
     18AC_ARG_WITH(private_dirs, 
     19        [  --with-private-dirs     use private scorefiles/savefiles/datafiles]) 
     20 
     21if test "x$with_setgid" = "xyes"; then 
     22        AC_MSG_ERROR([Please specify a group to install as.]) 
     23fi 
     24 
     25if test "x$wsetgid$with_private_dirs" != "xyes";  then 
    3226 
    3327        echo "Please run ./configure with one of: 
    … …  
    4539    in that user's home directory.  The game requires no special privileges if 
    4640    you do this, and should be used for most installations of the game. 
    47  
    48 --with-noinstall 
    49     This configures the game to store savefiles and scorefiles in the "lib" 
    50     directory that the game uses.  This is useful if you don't want to install 
    51     system-wide at all; \"make install\" will just move the executable to the 
    52     directory above \"src\" if you choose this option.  This option is 
    53     recommended for developers. 
    5441" 
    5542 
    … …  
    5744fi 
    5845 
    59  
    60 dnl Check for C compiler 
    61 AC_LANG([C]) 
    6246AC_PROG_CC 
    63  
    64 test "$GCC" = "yes" && CFLAGS="$CFLAGS -fno-strength-reduce -Wall" 
    65  
    66 dnl Checks for various programs 
     47AC_PROG_MAKE_SET 
     48AC_PROG_LN_S 
    6749AC_PROG_INSTALL 
    68 AC_PROG_LN_S 
    69 AC_PROG_MAKE_SET 
    70  
    71 MY_PROG_MAKE_SYSVINC 
    72 MY_PROG_MAKE_SINCLUDE 
     50AC_PROG_MKDIR_P 
    7351 
    7452AC_PATH_PROG(RM, rm) 
    … …  
    7654AC_PATH_PROG(CP, cp) 
    7755 
     56AC_HEADER_DIRENT 
     57AC_CHECK_HEADERS([fcntl.h stdint.h]) 
     58AC_HEADER_STDBOOL 
     59AC_C_CONST 
     60AC_TYPE_SIGNAL 
     61AC_CHECK_FUNCS([setresgid setegid can_change_color stat]) 
     62 
     63dnl needed because h-basic.h checks for this define for autoconf support. 
     64CFLAGS="$CFLAGS -DHAVE_CONFIG_H" 
     65CPPFLAGS="$CPPFLAGS -I."  
     66 
     67test "$GCC" = "yes" && CFLAGS="$CFLAGS -fno-strength-reduce -Wall" 
     68 
     69MY_PROG_MAKE_SYSVINC 
     70MY_PROG_MAKE_SINCLUDE 
     71 
    7872dnl Work around an autoconf bug. 
    7973if test "$prefix" = "NONE"; then 
    8074        prefix="${ac_default_prefix}" 
    8175fi 
    82  
    83  
    8476 
    8577if test "x$with_private_dirs" != "x"; then 
    … …  
    240232fi 
    241233 
    242  
    243  
    244 dnl Check for headers, types, functions 
    245 AC_CHECK_HEADERS([fcntl.h stdint.h dirent.h]) 
    246 AC_HEADER_STDBOOL 
    247 AC_C_CONST 
    248 AC_TYPE_SIGNAL 
    249 AC_CHECK_FUNCS([setresgid setegid can_change_color stat]) 
    250  
    251  
    252  
    253 AC_CONFIG_FILES([mk/rules.mk mk/sinc@&t@lude.mk]) 
     234AC_CONFIG_FILES([mk/extra.mk mk/sinc@&t@lude.mk]) 
    254235AC_OUTPUT 
    255  
    256236 
    257237echo 
    … …  
    260240echo "  Install path:                           ${prefix}" 
    261241echo "  lib/ path:                              ${game_datadir}" 
     242if test "$wsetgid" = "yes"; then 
     243        echo "  (as group ${SETEGID})" 
     244else 
     245        echo "  (with private user files in ~/.angband/)" 
     246fi 
    262247echo 
    263248echo "-- Frontends --" 

  • trunk/lib/Makefile

    r1125 r1447  
    11MKPATH=../mk/ 
    2 include $(MKPATH)rules.mk 
    3 include $(MKPATH)objective.mk 
     2include $(MKPATH)buildsys.mk 
    43 
    54SUBDIRS = apex bone data edit file help info pref save user xtra 

  • trunk/lib/apex/Makefile

    r1125 r1447  
    11MKPATH=../../mk/ 
    2 include $(MKPATH)rules.mk 
    3 include $(MKPATH)objective.mk 
     2include $(MKPATH)buildsys.mk 
    43 
    5 OBJECTIVE_DATA = \ 
    6         delete.me:${DATA_PATH}/apex 
     4DATA = delete.me 
     5PACKAGE = ${PACKAGE_NAME}/apex 
    76 
    8 install-posthook: 
     7install-extra: 
    98        if [ "x$(SETEGID)" != "x" ]; then \ 
    10                 printf "%10s %-20s\n" TOUCH ${DATA_PATH}/apex/scores.raw; \ 
    119                if [ "x$(DRY)" = "x" ]; then \ 
    12                         touch ${DATA_PATH}/apex/scores.raw; \ 
    13                         chown -R root:${SETEGID} ${DATA_PATH}/apex; \ 
    14                         chmod -R g+w ${DATA_PATH}/apex; \ 
     10                        ${MKDIR_P} ${DESTDIR}$game_datadir/${PACKAGE}; \ 
     11                        touch ${DESTDIR}$game_datadir/${PACKAGE}/scores.raw; \ 
     12                        chown -R root:${SETEGID} ${DESTDIR}$game_datadir/${PACKAGE}; \ 
     13                        chmod -R g+w ${DESTDIR}$game_datadir/${PACKAGE}; \ 
    1514                fi; \ 
    16         fi; 
     15        fi 

  • trunk/lib/bone/Makefile

    r1125 r1447  
    11MKPATH=../../mk/ 
    2 include $(MKPATH)rules.mk 
    3 include $(MKPATH)objective.mk 
     2include $(MKPATH)buildsys.mk 
    43 
    5 OBJECTIVE_DATA = \ 
    6         delete.me:${DATA_PATH}/bone 
    7  
    8 install-posthook: 
    9         if [ "x$(SETEGID)" != "x" ]; then \ 
    10                 if [ "x$(DRY)" = "x" ]; then \ 
    11                         chown root:${SETEGID} ${DATA_PATH}/bone; \ 
    12                         chmod 070 ${DATA_PATH}/bone; \ 
    13                 fi; \ 
    14         fi 
     4DATA = delete.me 
     5PACKAGE = ${PACKAGE_NAME}/bone 

  • trunk/lib/data/Makefile

    r1125 r1447  
    11MKPATH=../../mk/ 
    2 include $(MKPATH)rules.mk 
    3 include $(MKPATH)objective.mk 
     2include $(MKPATH)buildsys.mk 
    43 
    5 OBJECTIVE_DATA = \ 
    6         delete.me:${DATA_PATH}/data 
     4PACKAGE = ${PACKAGE_NAME}/data 
     5DATA_ = artifact ego_item flavor limits monster object p_class p_hist p_race prices shop_own spells terrain vault 
    76 
    8 clean-posthook: 
    9         -$(RM) *.raw 
    10  
    11 install-posthook: 
     7install-extra: 
    128        if [ "x$(SETEGID)" != "x" ]; then \ 
    13                 printf "%10s %s*.raw\n" TOUCH ${DATA_PATH}/data/; \ 
    14                 if [ "x$(DRY)" = "x" ]; then \ 
    15                         touch ${DATA_PATH}/data/artifact.raw; \ 
    16                         touch ${DATA_PATH}/data/ego_item.raw; \ 
    17                         touch ${DATA_PATH}/data/flavor.raw; \ 
    18                         touch ${DATA_PATH}/data/limits.raw; \ 
    19                         touch ${DATA_PATH}/data/monster.raw; \ 
    20                         touch ${DATA_PATH}/data/object.raw; \ 
    21                         touch ${DATA_PATH}/data/p_class.raw; \ 
    22                         touch ${DATA_PATH}/data/p_hist.raw; \ 
    23                         touch ${DATA_PATH}/data/p_race.raw; \ 
    24                         touch ${DATA_PATH}/data/prices.raw; \ 
    25                         touch ${DATA_PATH}/data/shop_own.raw; \ 
    26                         touch ${DATA_PATH}/data/spells.raw; \ 
    27                         touch ${DATA_PATH}/data/terrain.raw; \ 
    28                         touch ${DATA_PATH}/data/vault.raw; \ 
    29                         chown -R root:${SETEGID} ${DATA_PATH}/data; \ 
    30                         chmod -R g+w ${DATA_PATH}/data; \ 
    31                 fi; \ 
     9                ${MKDIR_P} ${DESTDIR}${datadir}/$(PACKAGE); \ 
     10                for i in ${DATA_}; do \ 
     11                        touch ${DESTDIR}${datadir}/$(PACKAGE)/$${i}.raw; \ 
     12                done; \ 
     13                chown -R root:${SETEGID} ${DESTDIR}${datadir}/$(PACKAGE); \ 
     14                chmod -R g+w ${DESTDIR}${datadir}/$(PACKAGE); \ 
    3215        fi 

  • trunk/lib/edit/Makefile

    r1125 r1447  
    11MKPATH=../../mk/ 
    2 include $(MKPATH)rules.mk 
    3 include $(MKPATH)objective.mk 
     2include $(MKPATH)buildsys.mk 
    43 
    5 OBJECTIVE_DATA =                        \ 
    6         artifact.txt:$(DATA_PATH)/edit  \ 
    7         ego_item.txt:${DATA_PATH}/edit  \ 
    8         flavor.txt:${DATA_PATH}/edit    \ 
    9         limits.txt:${DATA_PATH}/edit    \ 
    10         monster.txt:${DATA_PATH}/edit   \ 
    11         object.txt:${DATA_PATH}/edit    \ 
    12         p_class.txt:${DATA_PATH}/edit   \ 
    13         p_hist.txt:${DATA_PATH}/edit    \ 
    14         p_race.txt:${DATA_PATH}/edit    \ 
    15         shop_own.txt:${DATA_PATH}/edit  \ 
    16         store.txt:$(DATA_PATH)/edit     \ 
    17         spell.txt:${DATA_PATH}/edit     \ 
    18         terrain.txt:${DATA_PATH}/edit   \ 
    19         vault.txt:${DATA_PATH}/edit 
     4DATA = artifact.txt ego_item.txt flavor.txt limits.txt monster.txt object.txt p_class.txt p_hist.txt p_race.txt shop_own.txt spell.txt store.txt terrain.txt vault.txt 
     5PACKAGE = ${PACKAGE_NAME}/edit 
     6 

  • trunk/lib/file/Makefile

    r1125 r1447  
    11MKPATH=../../mk/ 
    2 include $(MKPATH)rules.mk 
    3 include $(MKPATH)objective.mk 
     2include $(MKPATH)buildsys.mk 
    43 
    5 OBJECTIVE_DATA = \ 
    6         crown.txt:${DATA_PATH}/file \ 
    7         dead.txt:${DATA_PATH}/file \ 
    8         news.txt:${DATA_PATH}/file 
     4DATA = crown.txt dead.txt news.txt 
     5PACKAGE = ${PACKAGE_NAME}/file 
     6 

  • trunk/lib/help/Makefile

    r1125 r1447  
    11MKPATH=../../mk/ 
    2 include $(MKPATH)rules.mk 
    3 include $(MKPATH)objective.mk 
     2include $(MKPATH)buildsys.mk 
    43 
    5 OBJECTIVE_DATA =        \ 
    6         attack.txt:${DATA_PATH}/help  \ 
    7         birth.txt:${DATA_PATH}/help   \ 
    8         command.txt:${DATA_PATH}/help \ 
    9         dungeon.txt:${DATA_PATH}/help \ 
    10         general.txt:${DATA_PATH}/help \ 
    11         option.txt:${DATA_PATH}/help  \ 
    12         playing.txt:${DATA_PATH}/help \ 
    13         version.txt:${DATA_PATH}/help \ 
    14         help.hlp:${DATA_PATH}/help    \ 
    15         308.txt:${DATA_PATH}/help 
     4DATA = 308.txt attack.txt birth.txt command.txt dungeon.txt general.txt help.hlp option.txt playing.txt version.txt 
     5PACKAGE = ${PACKAGE_NAME}/help 
    166 
    17  

  • trunk/lib/info/Makefile

    r1125 r1447  
    11MKPATH=../../mk/ 
    2 include $(MKPATH)rules.mk 
    3 include $(MKPATH)objective.mk 
     2include $(MKPATH)buildsys.mk 
    43 
    5 OBJECTIVE_DATA = \ 
    6         delete.me:${DATA_PATH}/info 
     4DATA = delete.me 
     5PACKAGE = ${PACKAGE_NAME}/info 
     6 

  • trunk/lib/pref/Makefile

    r1125 r1447  
    11MKPATH=../../mk/ 
    2 include $(MKPATH)rules.mk 
    3 include $(MKPATH)objective.mk 
     2include $(MKPATH)buildsys.mk 
    43 
    5 OBJECTIVE_DATA =        \ 
    6         flvr-dvg.prf:${DATA_PATH}/pref \ 
    7         flvr-new.prf:${DATA_PATH}/pref \ 
    8         flvr-xxx.prf:${DATA_PATH}/pref \ 
    9         font.prf:${DATA_PATH}/pref     \ 
    10         font-mac.prf:${DATA_PATH}/pref \ 
    11         font-win.prf:${DATA_PATH}/pref \ 
    12         font-x11.prf:${DATA_PATH}/pref \ 
    13         font-xxx.prf:${DATA_PATH}/pref \ 
    14         graf.prf:${DATA_PATH}/pref     \ 
    15         graf-dvg.prf:${DATA_PATH}/pref \ 
    16         graf-mac.prf:${DATA_PATH}/pref \ 
    17         graf-new.prf:${DATA_PATH}/pref \ 
    18         graf-win.prf:${DATA_PATH}/pref \ 
    19         graf-x11.prf:${DATA_PATH}/pref \ 
    20         graf-xxx.prf:${DATA_PATH}/pref \ 
    21         message.prf:${DATA_PATH}/pref  \ 
    22         pref.prf:${DATA_PATH}/pref     \ 
    23         pref-acn.prf:${DATA_PATH}/pref \ 
    24         pref-gcu.prf:${DATA_PATH}/pref \ 
    25         pref-mac.prf:${DATA_PATH}/pref \ 
    26         pref-sdl.prf:${DATA_PATH}/pref \ 
    27         pref-x11.prf:${DATA_PATH}/pref \ 
    28         user.prf:${DATA_PATH}/pref     \ 
    29         user-mac.prf:${DATA_PATH}/pref \ 
    30         xtra-dvg.prf:${DATA_PATH}/pref \ 
    31         xtra-new.prf:${DATA_PATH}/pref \ 
    32         xtra-xxx.prf:${DATA_PATH}/pref \ 
     4DATA = flvr-dvg.prf font-gtk.prf font-win.prf graf-gtk.prf graf-sdl.prf \ 
     5       pref-mac.prf pref-x11.prf xtra-new.prf flvr-new.prf font-mac.prf \ 
     6       font-x11.prf graf-mac.prf graf-win.prf message.prf pref.prf      \ 
     7       user-mac.prf xtra-xxx.prf flvr-xxx.prf font.prf font-xxx.prf     \ 
     8       graf-new.prf graf-x11.prf pref-acn.prf pref-sdl.prf user.prf     \ 
     9       font-gcu.prf font-sdl.prf graf-dvg.prf graf.prf graf-xxx.prf     \ 
     10       pref-gcu.prf pref-win.prf xtra-dvg.prf 
     11PACKAGE = ${PACKAGE_NAME}/pref 
     12 

  • trunk/lib/save/Makefile

    r1125 r1447  
    11MKPATH=../../mk/ 
    2 include $(MKPATH)rules.mk 
    3 include $(MKPATH)objective.mk 
     2include $(MKPATH)buildsys.mk 
    43 
    5 OBJECTIVE_DATA = \ 
    6         delete.me:${DATA_PATH}/save 
     4DATA = delete.me 
     5PACKAGE = ${PACKAGE_NAME}/save 
    76 
    8 install-posthook: 
     7install-extra: 
    98        if [ "x$(SETEGID)" != "x" ]; then \ 
    109                if [ "x$(DRY)" = "x" ]; then \ 
    11                         chown root:${SETEGID} ${DATA_PATH}/save; \ 
    12                         chmod 070 ${DATA_PATH}/save; \ 
     10                        ${MKDIR_P} ${DESTDIR}$game_datadir/${PACKAGE}; \ 
     11                        chown root:${SETEGID} ${DESTDIR}$game_datadir/${PACKAGE}; \ 
     12                        chmod 070 ${DESTDIR}$game_datadir/${PACKAGE}; \ 
    1313                fi; \ 
    1414        fi 

  • trunk/lib/user/Makefile

    r1125 r1447  
    11MKPATH=../../mk/ 
    2 include $(MKPATH)rules.mk 
    3 include $(MKPATH)objective.mk 
     2include $(MKPATH)buildsys.mk 
    43 
    5 OBJECTIVE_DATA = \ 
    6         delete.me:${DATA_PATH}/user 
     4DATA = delete.me 
     5PACKAGE = ${PACKAGE_NAME}/user 
     6 

  • trunk/lib/xtra/Makefile

    r1125 r1447  
    11MKPATH=../../mk/ 
    2 include $(MKPATH)rules.mk 
    3 include $(MKPATH)objective.mk 
     2include $(MKPATH)buildsys.mk 
    43 
    5 SUBDIRS = font graf sound icon 
     4DATA = angband.glade 
     5SUBDIRS = font graf icon sound 
     6PACKAGE = ${PACKAGE_NAME}/xtra 
    67 
    7 OBJECTIVE_DATA = \ 
    8         angband.glade:$(DATA_PATH)/xtra 

  • trunk/lib/xtra/font/Makefile

    r1125 r1447  
    11MKPATH=../../../mk/ 
    2 include $(MKPATH)rules.mk 
    3 include $(MKPATH)objective.mk 
     2include $(MKPATH)buildsys.mk 
    43 
    5 OBJECTIVE_DATA = \ 
    6         copying.txt:${DATA_PATH}/xtra/font  \ 
    7         5x8.fon:${DATA_PATH}/xtra/font      \ 
    8         6x10.fon:${DATA_PATH}/xtra/font     \ 
    9         6x12.fon:${DATA_PATH}/xtra/font     \ 
    10         6x13b.fon:${DATA_PATH}/xtra/font    \ 
    11         6x13.fon:${DATA_PATH}/xtra/font     \ 
    12         7x13b.fon:${DATA_PATH}/xtra/font    \ 
    13         7x13.fon:${DATA_PATH}/xtra/font     \ 
    14         8x13b.fon:${DATA_PATH}/xtra/font    \ 
    15         8x13c.fon:${DATA_PATH}/xtra/font    \ 
    16         8x13.fon:${DATA_PATH}/xtra/font     \ 
    17         8x16b.fon:${DATA_PATH}/xtra/font    \ 
    18         8x16.fon:${DATA_PATH}/xtra/font     \ 
    19         9x15b.fon:${DATA_PATH}/xtra/font    \ 
    20         9x15.fon:${DATA_PATH}/xtra/font     \ 
    21         10x17b.fon:${DATA_PATH}/xtra/font   \ 
    22         10x17.fon:${DATA_PATH}/xtra/font    \ 
    23         10x20.fon:${DATA_PATH}/xtra/font    \ 
    24         12x20b.fon:${DATA_PATH}/xtra/font   \ 
    25         12x20.fon:${DATA_PATH}/xtra/font    \ 
    26         12x24.fon:${DATA_PATH}/xtra/font    \ 
    27         16x25b.fon:${DATA_PATH}/xtra/font   \ 
    28         16x25.fon:${DATA_PATH}/xtra/font 
     4DATA = copying.txt 5x8.fon 6x10.fon 6x12.fon 6x13b.fon 6x13.fon 7x13b.fon \ 
     5       7x13b.fon 7x13.fon 8x13b.fon 8x13c.fon 8x13.fon 8x16b.fon 8x16.fon \ 
     6       9x15b.fon 9x15.fon 10x17b.fon 10x17.fon 10x20.fon 12x20b.fon 12x20.fon \ 
     7       12x24.fon 16x25b.fon 16x25.fon 
     8PACKAGE = ${PACKAGE_NAME}/xtra/font 

  • trunk/lib/xtra/graf/Makefile

    r1125 r1447  
    11MKPATH=../../../mk/ 
    2 include $(MKPATH)rules.mk 
    3 include $(MKPATH)objective.mk 
     2include $(MKPATH)buildsys.mk 
    43 
    5 OBJECTIVE_DATA = \ 
    6         16x16.bmp:${DATA_PATH}/xtra/graf    \ 
    7         16x16.png:${DATA_PATH}/xtra/graf    \ 
    8         32x32.png:${DATA_PATH}/xtra/graf    \ 
    9         8x13.bmp:${DATA_PATH}/xtra/graf     \ 
    10         8x8.bmp:${DATA_PATH}/xtra/graf      \ 
    11         8x8.png:${DATA_PATH}/xtra/graf      \ 
    12         backgrnd.bmp:${DATA_PATH}/xtra/graf \ 
    13         mask.bmp:${DATA_PATH}/xtra/graf     \ 
     4DATA = 16x16.bmp 16x16.png 32x32.png 8x13.bmp 8x8.bmp 8x8.png backgrnd.bmp mask.bmp 
     5PACKAGE = ${PACKAGE_NAME}/xtra/graf 
     6 

  • trunk/lib/xtra/icon/Makefile

    r1125 r1447  
    11MKPATH=../../../mk/ 
    2 include $(MKPATH)rules.mk 
    3 include $(MKPATH)objective.mk 
     2include $(MKPATH)buildsys.mk 
    43 
    5 OBJECTIVE_DATA = \ 
    6         att-16.png:$(DATA_PATH)/xtra/icon \ 
    7         att-32.png:$(DATA_PATH)/xtra/icon \ 
    8         att-128.png:$(DATA_PATH)/xtra/icon \ 
    9         att-256.png:$(DATA_PATH)/xtra/icon \ 
    10         att-512.png:$(DATA_PATH)/xtra/icon \ 
     4DATA = att-16.png att-32.png att-128.png att-256.png att-512.png 
     5PACKAGE = ${PACKAGE_NAME}/xtra/icon 
     6 

  • trunk/lib/xtra/sound/Makefile

    r1125 r1447  
    11MKPATH=../../../mk/ 
    2 include $(MKPATH)rules.mk 
    3 include $(MKPATH)objective.mk 
     2include $(MKPATH)buildsys.mk 
    43 
    5 OBJECTIVE_DATA = \ 
    6         sound.cfg:${DATA_PATH}/xtra/sound    \ 
    7         breath.wav:${DATA_PATH}/xtra/sound   \ 
    8         clunk.wav:${DATA_PATH}/xtra/sound    \ 
    9         death.wav:${DATA_PATH}/xtra/sound    \ 
    10         destroy.wav:${DATA_PATH}/xtra/sound  \ 
    11         drop.wav:${DATA_PATH}/xtra/sound     \ 
    12         eat.wav:${DATA_PATH}/xtra/sound      \ 
    13         flee.wav:${DATA_PATH}/xtra/sound     \ 
    14         hallu.wav:${DATA_PATH}/xtra/sound    \ 
    15         hit.wav:${DATA_PATH}/xtra/sound      \ 
    16         hit1.wav:${DATA_PATH}/xtra/sound     \ 
    17         kill.wav:${DATA_PATH}/xtra/sound     \ 
    18         kill1.wav:${DATA_PATH}/xtra/sound    \ 
    19         level.wav:${DATA_PATH}/xtra/sound    \ 
    20         miss.wav:${DATA_PATH}/xtra/sound     \ 
    21         miss1.wav:${DATA_PATH}/xtra/sound    \ 
    22         money.wav:${DATA_PATH}/xtra/sound    \ 
    23         opendoor.wav:${DATA_PATH}/xtra/sound \ 
    24         shutdoor.wav:${DATA_PATH}/xtra/sound \ 
    25         thump.wav:${DATA_PATH}/xtra/sound    \ 
    26         vomit.wav:${DATA_PATH}/xtra/sound 
     4DATA = sound.cfg breath.wav clunk.wav death.wav destroy.wav drop.wav eat.wav \ 
     5       flee.wav hallu.wav hit.wav hit1.wav kill.wav kill1.wav level.wav \ 
     6       miss.wav miss1.wav money.wav opendoor.wav shutdoor.wav thump.wav \ 
     7       vomit.wav 
     8PACKAGE = ${PACKAGE_NAME}/xtra/sound 
    279 

  • trunk/mk/sinclude.mk.in

    • Property svn:eol-style set to native

  • trunk/src/Makefile

    r1323 r1447  
    11MKPATH=../mk/ 
    2 include $(MKPATH)rules.mk 
    3 include $(MKPATH)objective.mk 
     2include $(MKPATH)buildsys.mk 
    43 
    54# import source list 
    65include Makefile.src 
    7 HEADERS = $(HDRS) $(INCS) 
     6INCLUDE = $(HDRS) $(INCS) 
    87OBJECTS = $(ANGFILES) $(MAINFILES) $(ZFILES) 
    9 SOURCES = ${OBJECTS:.o=.c} 
    10  
     8SRCS    = ${OBJECTS:.o=.c} 
    119SUBDIRS = gtk monster object player 
    12  
    13 OBJECTIVE_BINS = angband 
    14  
     10PROG    = angband 
    1511CFLAGS += -I. 
    1612 
    … …  
    1915        @printf "%10s %-20s\n" LINK $@ 
    2016 
    21 clean-prehook: 
     17clean-extra: 
    2218        -rm autoconf.h 
    23  
    24 install-posthook: 
    25         @if [ "x$(SETEGID)" != "x" ]; then \ 
    26                 printf "%10s $(DESTDIR)$(BINDIR)/angband\n" CHOWN; \ 
    27                 if [ "x$(DRY)" = "x" ]; then \ 
    28                         chown root:${SETEGID} $(DESTDIR)$(BINDIR)/angband; \ 
    29                         chmod g+s $(DESTDIR)$(BINDIR)/angband; \ 
    30                 fi; \ 
    31         fi 

  • trunk/src/gtk/Makefile

    r1125 r1447  
    11MKPATH=../../mk/ 
    2 include $(MKPATH)rules.mk 
    3 include $(MKPATH)objective.mk 
     2include $(MKPATH)buildsys.mk 
    43 

  • trunk/src/monster/Makefile

    r1323 r1447  
    11MKPATH=../../mk/ 
    2 include $(MKPATH)rules.mk 
    3 include $(MKPATH)objective.mk 
     2include $(MKPATH)extra.mk $(MKPATH)buildsys.mk 
    43 

  • trunk/src/object/Makefile

    r1323 r1447  
    11MKPATH=../../mk/ 
    2 include $(MKPATH)rules.mk 
    3 include $(MKPATH)objective.mk 
     2include $(MKPATH)extra.mk $(MKPATH)buildsys.mk 
    43 

  • trunk/src/player/Makefile

    r1323 r1447  
    11MKPATH=../../mk/ 
    2 include $(MKPATH)rules.mk 
    3 include $(MKPATH)objective.mk 
    4  
     2include $(MKPATH)extra.mk $(MKPATH)buildsys.mk