Changeset 77

Show
Ignore:
Timestamp:
04/24/07 11:33:41 (1 year ago)
Author:
takkaria
Message:
  • Move to only the one list of files for makefiles (not very pleasant right now)
  • Remove unused autoconf checks. (Hallvard Furuseth's patches were useful here)
  • Remove Makefile.ibm -- Makefile.dos does the IBM port too
  • add missing lib/info Makefile
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/configure.ac

    r74 r77  
    2929AC_PROG_LN_S 
    3030AC_PROG_MAKE_SET 
    31 AC_PROG_GCC_TRADITIONAL 
    3231 
    3332AC_PATH_PROG(RM, rm) 
    …… 
    171170 
    172171dnl Check for headers. 
    173 AC_HEADER_STDBOOL 
     172dnl AC_HEADER_STDBOOL -- not yet 
    174173AC_HEADER_TIME 
    175 AC_CHECK_HEADERS([unistd.h fcntl.h sys/ioctl.h fnmatch.h limits.h wchar.h fts.h stdint.h sys/time.h termios.h]) 
    176  
    177 dnl Check for supported keywords. 
    178 AC_C_CONST 
    179 AC_C_INLINE 
     174AC_CHECK_HEADERS([unistd.h fcntl.h limits.h stdint.h sys/time.h termios.h]) 
    180175 
    181176dnl Check for types. 
    182177AC_TYPE_SIGNAL 
    183 AC_TYPE_SIZE_T 
    184178AC_TYPE_INT16_T 
    185179AC_TYPE_INT32_T 
    …… 
    191185 
    192186dnl Check for functions. 
    193 AC_FUNC_MMAP 
    194 AC_FUNC_MEMCMP 
    195 AC_FUNC_STRFTIME 
    196 AC_FUNC_VPRINTF 
    197187AC_FUNC_STAT 
    198188AC_FUNC_SELECT_ARGTYPES 
    199 AC_FUNC_MALLOC 
    200 AC_FUNC_REALLOC 
    201 AC_CHECK_FUNCS([atexit floor memmove memset modf pow strchr strdup strrchr gethostname mkdir select strstr strtol usleep mkstemp setegid can_change_color munmap]) 
     189AC_CHECK_FUNCS([memmove memset strrchr mkdir strtol usleep mkstemp setegid can_change_color]) 
    202190 
    203191dnl XXX: Work around some autoconf bugs. 

  • trunk/src/Makefile

    r74 r77  
    44 
    55# import source list 
    6 include src.mk 
     6include Makefile.src 
     7HEADERS = $(HDRS) $(INCS) 
     8SOURCES = $(addsuffix .c,$(ANGFILES) $(MAINFILES) $(ZFILES)) 
     9OBJECTS = $(addsuffix .o,$(ANGFILES) $(MAINFILES) $(ZFILES)) 
     10 
    711 
    812# These are for OS-specific ports; ignore 'em until we use autoconf everywhere. 

  • trunk/src/Makefile.inc

    r69 r77  
    22# File: Makefile.inc 
    33# 
    4 # A makefile which includes the current object files, hopefully includable 
    5 # across a range of different makefiles, to cut down on maintenance. 
     4# Includes Makefile.src and contains dependency info 
    65# 
    76 
    8 HDRS = h-basic.h h-config.h 
    9 INCS = angband.h config.h defines.h types.h externs.h \ 
    10        z-term.h z-rand.h z-util.h z-virt.h z-form.h $(HDRS) 
     7include Makefile.src 
    118 
    12 BASEOBJS := $(addsuffix $(OBJEXT),\ 
    13   birth \ 
    14   cave \ 
    15   cmd1 \ 
    16   cmd2 \ 
    17   cmd3 \ 
    18   cmd4 \ 
    19   cmd5 \ 
    20   cmd6 \ 
    21   dungeon \ 
    22   files \ 
    23   generate \ 
    24   init1 \ 
    25   init2 \ 
    26   load \ 
    27   melee1 \ 
    28   melee2 \ 
    29   monster1 \ 
    30   monster2 \ 
    31   object1 \ 
    32   object2 \ 
    33   obj-info \ 
    34   pathfind \ 
    35   randart \ 
    36   randname \ 
    37   save \ 
    38   spells1 \ 
    39   spells2 \ 
    40   squelch \ 
    41   store \ 
    42   tables \ 
    43   ui \ 
    44   use-obj \ 
    45   util \ 
    46   variable \ 
    47   wizard1 \ 
    48   wizard2 \ 
    49   x-spell \ 
    50   xtra1 \ 
    51   xtra2) 
     9BASEOJS := $(addsuffix $(OBJEXT), $(ANGFILES)) 
     10ZOBJS := $(addsuffix $(OBJEXT), $(ZFILES)) 
    5211 
    53 ZOBJS := $(addsuffix $(OBJEXT), z-file z-form z-rand z-term z-util z-virt) 
    54  
    55 # Just print out a list of object files 
    56 inc-print: 
    57         @echo $(BASEOBJS) 
    5812 
    5913# Note dependencies 

  • trunk/src/Makefile.src

    r76 r77  
    1 HEADERS = \ 
    2         h-basic.h  \ 
    3         h-config.h \ 
    4         angband.h  \ 
    5         config.h   \ 
    6         defines.h  \ 
    7         types.h    \ 
    8         externs.h  \ 
    9         z-term.h   \ 
    10         z-rand.h   \ 
    11         z-util.h   \ 
    12         z-virt.h   \ 
    13         z-form.h 
     1# 
     2# File: Makefile.src 
     3# 
     4# A makefile which includes the current object files, hopefully includable 
     5# across a range of different makefiles, to cut down on maintenance. 
     6# 
    147 
    15 SOURCES = \ 
    16         birth.c    \ 
    17         cave.c     \ 
    18         cmd1.c     \ 
    19         cmd2.c     \ 
    20         cmd3.c     \ 
    21         cmd4.c     \ 
    22         cmd5.c     \ 
    23         cmd6.c     \ 
    24         dungeon.c  \ 
    25         files.c    \ 
    26         generate.c \ 
    27         init1.c    \ 
    28         init2.c    \ 
    29         load.c     \ 
    30         maid-x11.c \ 
    31         main-cap.c \ 
    32         main-crb.c \ 
    33         main-dos.c \ 
    34         main-gcu.c \ 
    35         main-gtk.c \ 
    36         main-ibm.c \ 
    37         main-lsl.c \ 
    38         main-ros.c \ 
    39         main-sla.c \ 
    40         main-vcs.c \ 
    41         main-win.c \ 
    42         main-x11.c \ 
    43         main-xaw.c \ 
    44         main-xpj.c \ 
    45         main-xxx.c \ 
    46         main.c     \ 
    47         melee1.c   \ 
    48         melee2.c   \ 
    49         monster1.c \ 
    50         monster2.c \ 
    51         obj-info.c \ 
    52         object1.c  \ 
    53         object2.c  \ 
    54         randart.c  \ 
    55         randname.c \ 
    56         pathfind.c \ 
    57         save.c     \ 
    58         spells1.c  \ 
    59         spells2.c  \ 
    60         squelch.c  \ 
    61         store.c    \ 
    62         tables.c   \ 
    63         ui.c       \ 
    64         use-obj.c  \ 
    65         util.c     \ 
    66         variable.c \ 
    67         wizard1.c  \ 
    68         wizard2.c  \ 
    69         x-spell.c  \ 
    70         xtra1.c    \ 
    71         xtra2.c    \ 
    72         z-file.c   \ 
    73         z-form.c   \ 
    74         z-rand.c   \ 
    75         z-term.c   \ 
    76         z-util.c   \ 
    77         z-virt.c 
     8HDRS = h-basic.h h-config.h 
     9INCS = angband.h config.h defines.h types.h externs.h \ 
     10       z-term.h z-rand.h z-util.h z-virt.h z-form.h 
    7811 
    79 OBJECTS = ${SOURCES:.c=.o} 
     12HEADERS = $(HDRS) $(INCS) 
    8013 
    81 inc-print: 
    82         @echo ${OBJECTS} 
     14ZFILES = z-file z-form z-rand z-term z-util z-virt 
     15MAINFILES = maid-x11 \ 
     16        $(addprefix main-,cap crb dos gcu gtk ibm lsl ros sla vcs win x11 xaw xpj) 
     17 
     18ANGFILES = \ 
     19        birth \ 
     20        cave \ 
     21        cmd1 \ 
     22        cmd2 \ 
     23        cmd3 \ 
     24        cmd4 \ 
     25        cmd5 \ 
     26        cmd6 \ 
     27        dungeon \ 
     28        files \ 
     29        generate \ 
     30        init1 \ 
     31        init2 \ 
     32        load \ 
     33        main \ 
     34        melee1 \ 
     35        melee2 \ 
     36        monster1 \ 
     37        monster2 \ 
     38        obj-info \ 
     39        object1 \ 
     40        object2 \ 
     41        randart \ 
     42        randname \ 
     43        pathfind \ 
     44        save \ 
     45        spells1 \ 
     46        spells2 \ 
     47        squelch \ 
     48        store \ 
     49        tables \ 
     50        ui \ 
     51        use-obj  \ 
     52        util  \ 
     53        variable \ 
     54        wizard1 \ 
     55        wizard2 \ 
     56        x-spell \ 
     57        xtra1 \ 
     58        xtra2 
     59 

  • trunk/src/autoconf.h.in

    r74 r77  
    44#undef DEFAULT_PATH 
    55 
    6 /* Define to 1 if you have the `atexit' function. */ 
    7 #undef HAVE_ATEXIT 
    8  
    96/* Define to 1 if you have the `can_change_color' function. */ 
    107#undef HAVE_CAN_CHANGE_COLOR 
    118 
    12 /* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ 
    13 #undef HAVE_DOPRNT 
    14  
    159/* Define to 1 if you have the <fcntl.h> header file. */ 
    1610#undef HAVE_FCNTL_H 
    17  
    18 /* Define to 1 if you have the `floor' function. */ 
    19 #undef HAVE_FLOOR 
    20  
    21 /* Define to 1 if you have the <fnmatch.h> header file. */ 
    22 #undef HAVE_FNMATCH_H 
    23  
    24 /* Define to 1 if you have the <fts.h> header file. */ 
    25 #undef HAVE_FTS_H 
    26  
    27 /* Define to 1 if you have the `gethostname' function. */ 
    28 #undef HAVE_GETHOSTNAME 
    29  
    30 /* Define to 1 if you have the `getpagesize' function. */ 
    31 #undef HAVE_GETPAGESIZE 
    3211 
    3312/* Define to 1 if you have the <inttypes.h> header file. */ 
    …… 
    3615/* Define to 1 if you have the <limits.h> header file. */ 
    3716#undef HAVE_LIMITS_H 
    38  
    39 /* Define to 1 if your system has a GNU libc compatible `malloc' function, and 
    40    to 0 otherwise. */ 
    41 #undef HAVE_MALLOC 
    4217 
    4318/* Define to 1 if you have the `memmove' function. */ 
    …… 
    5631#undef HAVE_MKSTEMP 
    5732 
    58 /* Define to 1 if you have a working `mmap' system call. */ 
    59 #undef HAVE_MMAP 
    60  
    61 /* Define to 1 if you have the `modf' function. */ 
    62 #undef HAVE_MODF 
    63  
    64 /* Define to 1 if you have the `munmap' function. */ 
    65 #undef HAVE_MUNMAP 
    66  
    67 /* Define to 1 if you have the `pow' function. */ 
    68 #undef HAVE_POW 
    69  
    70 /* Define to 1 if your system has a GNU libc compatible `realloc' function, 
    71    and to 0 otherwise. */ 
    72 #undef HAVE_REALLOC 
    73  
    74 /* Define to 1 if you have the `select' function. */ 
    75 #undef HAVE_SELECT 
    76  
    7733/* Define to 1 if you have the `setegid' function. */ 
    7834#undef HAVE_SETEGID 
    …… 
    8238#undef HAVE_STAT_EMPTY_STRING_BUG 
    8339 
    84 /* Define to 1 if stdbool.h conforms to C99. */ 
    85 #undef HAVE_STDBOOL_H 
    86  
    8740/* Define to 1 if you have the <stdint.h> header file. */ 
    8841#undef HAVE_STDINT_H 
    …… 
    9043/* Define to 1 if you have the <stdlib.h> header file. */ 
    9144#undef HAVE_STDLIB_H 
    92  
    93 /* Define to 1 if you have the `strchr' function. */ 
    94 #undef HAVE_STRCHR 
    95  
    96 /* Define to 1 if you have the `strdup' function. */ 
    97 #undef HAVE_STRDUP 
    98  
    99 /* Define to 1 if you have the `strftime' function. */ 
    100 #undef HAVE_STRFTIME 
    10145 
    10246/* Define to 1 if you have the <strings.h> header file. */ 
    …… 
    10953#undef HAVE_STRRCHR 
    11054 
    111 /* Define to 1 if you have the `strstr' function. */ 
    112 #undef HAVE_STRSTR 
    113  
    11455/* Define to 1 if you have the `strtol' function. */ 
    11556#undef HAVE_STRTOL 
    116  
    117 /* Define to 1 if you have the <sys/ioctl.h> header file. */ 
    118 #undef HAVE_SYS_IOCTL_H 
    11957 
    12058/* Define to 1 if you have the <sys/select.h> header file. */ 
    …… 
    14179/* Define to 1 if you have the `usleep' function. */ 
    14280#undef HAVE_USLEEP 
    143  
    144 /* Define to 1 if you have the `vprintf' function. */ 
    145 #undef HAVE_VPRINTF 
    146  
    147 /* Define to 1 if you have the <wchar.h> header file. */ 
    148 #undef HAVE_WCHAR_H 
    149  
    150 /* Define to 1 if the system has the type `_Bool'. */ 
    151 #undef HAVE__BOOL 
    15281 
    15382/* Define to 1 if `lstat' dereferences a symlink specified with a trailing 
    …… 
    224153#undef _UINT32_T 
    225154 
    226 /* Define to empty if `const' does not conform to ANSI C. */ 
    227 #undef const 
    228  
    229 /* Define to `__inline__' or `__inline' if that's what the C compiler 
    230    calls it, or to nothing if 'inline' is not supported under any name.  */ 
    231 #ifndef __cplusplus 
    232 #undef inline 
    233 #endif 
    234  
    235155/* Define to the type of a signed integer type of width exactly 16 bits if 
    236156   such a type exists and the standard includes do not define it. */ 
    …… 
    241161#undef int32_t 
    242162 
    243 /* Define to rpl_malloc if the replacement function should be used. */ 
    244 #undef malloc 
    245  
    246 /* Define to rpl_realloc if the replacement function should be used. */ 
    247 #undef realloc 
    248  
    249 /* Define to `unsigned int' if <sys/types.h> does not define. */ 
    250 #undef size_t 
    251  
    252163/* Define to the type of an unsigned integer type of width exactly 16 bits if 
    253164   such a type exists and the standard includes do not define it. */