Changeset 584

Show
Ignore:
Timestamp:
09/28/07 12:09:38 (10 months ago)
Author:
takkaria
Message:

Simplify and make consistent the makefile setup; also, fix up r582.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Makefile

    r74 r584  
    1 .SILENT: 
    2  
    31include mk/rules.mk 
    4 include mk/init.mk 
     2include mk/objective.mk 
    53 
    64SUBDIRS = src lib 
    7  
    8 include mk/objective.mk 

  • trunk/configure.ac

    r582 r584  
    124124 
    125125 
    126 if test "x$enable_gtk$with_setgid" != "xyes"; then 
    127         AC_MSG_ERROR([The "setgid" option and the GTK port are incompatible.]) 
     126if test "x$enable_gtk" = "xyes"; then 
     127        if test "x$wsetgid" = "xyes"; then 
     128                AC_MSG_ERROR([The "setgid" option and the GTK port are incompatible.]) 
     129        fi 
    128130fi 
    129131 

  • trunk/lib/Makefile

    r74 r584  
    11include ../mk/rules.mk 
    2 include ../mk/init.mk 
     2include ../mk/objective.mk 
    33 
    44SUBDIRS = apex bone data edit file help info pref save user xtra 
    5  
    6 include ../mk/objective.mk 

  • trunk/lib/apex/Makefile

    r281 r584  
    1 .SILENT: 
    2  
    31include ../../mk/rules.mk 
    4 include ../../mk/init.mk 
     2include ../../mk/objective.mk 
    53 
    64OBJECTIVE_DATA = \ 
    75        delete.me:${DATA_PATH}/apex 
    86 
    9 include ../../mk/objective.mk 
    10  
    117install-posthook: 
    128        if [ "x$(SETEGID)" != "x" ]; then \ 
    13                 printf "%10s     %-20s\n" TOUCH ${DATA_PATH}/apex/scores.raw; \ 
     9                printf "%10s %-20s\n" TOUCH ${DATA_PATH}/apex/scores.raw; \ 
    1410                if [ "x$(DRY)" = "x" ]; then \ 
    1511                        touch ${DATA_PATH}/apex/scores.raw; \ 

  • trunk/lib/bone/Makefile

    r281 r584  
    11include ../../mk/rules.mk 
    2 include ../../mk/init.mk 
     2include ../../mk/objective.mk 
    33 
    44OBJECTIVE_DATA = \ 
    55        delete.me:${DATA_PATH}/bone 
    6  
    7 include ../../mk/objective.mk 
    86 
    97install-posthook: 

  • trunk/lib/data/Makefile

    r582 r584  
    1 .SILENT: 
    2  
    31include ../../mk/rules.mk 
    4 include ../../mk/init.mk 
     2include ../../mk/objective.mk 
    53 
    64OBJECTIVE_DATA = \ 
    75        delete.me:${DATA_PATH}/data 
    8  
    9 include ../../mk/objective.mk 
    106 
    117clean-posthook: 
    …… 
    1410install-posthook: 
    1511        if [ "x$(SETEGID)" != "x" ]; then \ 
    16                 printf "%10s     %s*.raw\n" TOUCH ${DATA_PATH}/data/; \ 
     12                printf "%10s %s*.raw\n" TOUCH ${DATA_PATH}/data/; \ 
    1713                if [ "x$(DRY)" = "x" ]; then \ 
    1814                        touch ${DATA_PATH}/data/artifact.raw; \ 

  • trunk/lib/edit/Makefile

    r399 r584  
    11include ../../mk/rules.mk 
    2 include ../../mk/init.mk 
    32include ../../mk/objective.mk 
    43 

  • trunk/lib/file/Makefile

    r74 r584  
    11include ../../mk/rules.mk 
    2 include ../../mk/init.mk 
     2include ../../mk/objective.mk 
    33 
    44OBJECTIVE_DATA = \ 
    55        dead.txt:${DATA_PATH}/file \ 
    66        news.txt:${DATA_PATH}/file 
    7  
    8 include ../../mk/objective.mk 

  • trunk/lib/help/Makefile

    r399 r584  
    11include ../../mk/rules.mk 
    2 include ../../mk/init.mk 
    32include ../../mk/objective.mk 
    43 

  • trunk/lib/info/Makefile

    r77 r584  
    1 .SILENT: 
    2  
    31include ../../mk/rules.mk 
    4 include ../../mk/init.mk 
    52include ../../mk/objective.mk 
    63 
    74OBJECTIVE_DATA = \ 
    85        delete.me:${DATA_PATH}/info 
    9  
    10  

  • trunk/lib/pref/Makefile

    r162 r584  
    11include ../../mk/rules.mk 
    2 include ../../mk/init.mk 
    32include ../../mk/objective.mk 
    43 

  • trunk/lib/save/Makefile

    r281 r584  
    11include ../../mk/rules.mk 
    2 include ../../mk/init.mk 
    32include ../../mk/objective.mk 
    43 

  • trunk/lib/user/Makefile

    r74 r584  
    11include ../../mk/rules.mk 
    2 include ../../mk/init.mk 
     2include ../../mk/objective.mk 
    33 
    44OBJECTIVE_DATA = \ 
    55        delete.me:${DATA_PATH}/user 
    6  
    7 include ../../mk/objective.mk 

  • trunk/lib/xtra/Makefile

    r553 r584  
    11include ../../mk/rules.mk 
    2 include ../../mk/init.mk 
    32include ../../mk/objective.mk 
    43 
    54SUBDIRS = font graf sound 
    65 
    7 OBJECTIVE_DATA =                   \ 
     6OBJECTIVE_DATA = \ 
    87        angband.glade:$(DATA_PATH)/xtra 

  • trunk/lib/xtra/font/Makefile

    r281 r584  
    11include ../../../mk/rules.mk 
    2 include ../../../mk/init.mk 
    32include ../../../mk/objective.mk 
    43 

  • trunk/lib/xtra/graf/Makefile

    r162 r584  
    11include ../../../mk/rules.mk 
    2 include ../../../mk/init.mk 
     2include ../../../mk/objective.mk 
    33 
    44OBJECTIVE_DATA = \ 
    …… 
    1111        backgrnd.bmp:${DATA_PATH}/xtra/graf \ 
    1212        mask.bmp:${DATA_PATH}/xtra/graf     \ 
    13  
    14 include ../../../mk/objective.mk 

  • trunk/lib/xtra/sound/Makefile

    r74 r584  
    11include ../../../mk/rules.mk 
    2 include ../../../mk/init.mk 
     2include ../../../mk/objective.mk 
    33 
    44OBJECTIVE_DATA = \ 
    …… 
    2525        vomit.wav:${DATA_PATH}/xtra/sound 
    2626 
    27 include ../../../mk/objective.mk 

  • trunk/mk/objective.mk

    r582 r584  
     1.SILENT: 
     2 
     3OBJECTIVE_DIRECTORIES =  
     4OBJECTIVE_LIBS =  
     5OBJECTIVE_LIBS_NOINST =  
     6OBJECTIVE_BINS =  
     7OBJECTIVE_DATA =  
     8SUBDIRS =  
     9HEADERS =  
     10V = 0 
     11VERBOSE ?= $(V) 
     12VERBOSITY = 0 
     13SHOW_CFLAGS ?= $(VERBOSE) 
     14 
     15LIBDIR = $(libdir) 
     16BINDIR = $(bindir) 
     17INCLUDEDIR = $(pkgincludedir) 
     18CFLAGS += -DHAVE_CONFIG_H -I/usr/pkg/include -I/usr/pkg/xorg/include 
     19CXXFLAGS += -DHAVE_CONFIG_H -I/usr/pkg/include -I/usr/pkg/xorg/include 
     20 
    121default: build 
    222 
    …… 
    178198.c.o: 
    179199        @if [ $(SHOW_CFLAGS) -eq 1 ]; then      \ 
    180                 printf "%10s     %-20s (%s)\n" CC $< "${CFLAGS}";     \ 
     200                printf "%10s %-20s (%s)\n" CC $< "${CFLAGS}"; \ 
    181201        else \ 
    182                 printf "%10s     %-20s\n" CC $<;      \ 
     202                printf "%10s %-20s\n" CC $<;  \ 
    183203        fi; 
    184204        $(CC) $(CFLAGS) -c $< -o $@ 
    …… 
    186206.cc.o .cxx.o: 
    187207        @if [ $(SHOW_CFLAGS) -eq 1 ]; then      \ 
    188                 printf "%10s     %-20s (%s)\n" CXX $< "${CXXFLAGS}";  \ 
     208                printf "%10s %-20s (%s)\n" CXX $< "${CXXFLAGS}";      \ 
    189209        else \ 
    190                 printf "%10s     %-20s\n" CXX $<;     \ 
     210                printf "%10s %-20s\n" CXX $<; \ 
    191211        fi; 
    192212        $(CXX) $(CXXFLAGS) -c $< -o $@ 

  • trunk/src/Makefile

    r582 r584  
    11include ../mk/rules.mk 
    2 include ../mk/init.mk 
    32include ../mk/objective.mk 
    43 
    …… 
    1817angband: $(OBJECTS) 
    1918        $(CC) $(OBJECTS) $(LDFLAGS) $(LDADD) -o $@  
    20         @printf "%10s     %-20s\n" LINK $@ 
     19        @printf "%10s %-20s\n" LINK $@ 
    2120 
    2221install-posthook: 
    2322        @if [ "x$(SETEGID)" != "x" ]; then \ 
    24                 printf "%10s     $(DESTDIR)$(BINDIR)/angband\n" CHOWN; \ 
     23                printf "%10s $(DESTDIR)$(BINDIR)/angband\n" CHOWN; \ 
    2524                if [ "x$(DRY)" = "x" ]; then \ 
    2625                        chown root:${SETEGID} $(DESTDIR)$(BINDIR)/angband; \ 

  • trunk/src/osx/English.lproj/Makefile

    r74 r584  
    1 .SILENT: 
    2  
    31include ../../../mk/rules.mk 
    4 include ../../../mk/init.mk 
     2include ../../../mk/objective.mk 
    53 
    64SUBDIRS = main.nib 
    75 
    8 include ../../../mk/objective.mk 
    9  

  • trunk/src/osx/English.lproj/main.nib/Makefile

    r74 r584  
    1 .SILENT: 
    2  
    31include ../../../../mk/rules.mk 
    4 include ../../../../mk/init.mk 
    5  
    62include ../../../../mk/objective.mk 
    7  

  • trunk/src/osx/Makefile

    r74 r584  
    1 .SILENT: 
    2  
    31include ../../mk/rules.mk 
    4 include ../../mk/init.mk 
     2include ../../mk/objective.mk 
    53 
    64SUBDIRS = English.lproj 
    7  
    8 include ../../mk/objective.mk 
    9