PennMUSH Community

Changeset 1019

Show
Ignore:
Timestamp:
07/07/07 22:38:53 (1 year ago)
Author:
shawnw
Message:

Makefile cleanup; don't link info_slave with sql libraries

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • 1.8.3/branches/devel/Makefile.in

    r947 r1019  
    2121SQL_LDFLAGS=@MYSQL_LDFLAGS@ @POSTGRESQL_LDFLAGS@ @SQLITE3_LDFLAGS@ 
    2222 
    23 CCFLAGS=@CFLAGS@ $(SQL_CFLAGS) -I.. -I../hdrs 
    24 LDFLAGS=@LDFLAGS@ $(SQL_LDFLAGS) 
     23CCFLAGS=@CFLAGS@ -I.. -I../hdrs 
     24LDFLAGS=@LDFLAGS@ 
    2525CLIBS=@LIBS@ 
    2626INSTALL=@INSTALL@ 
    …… 
    3939    (cd src; @MAKE@ all "CC=$(CC)" "CCFLAGS=$(CCFLAGS)" \ 
    4040    "LDFLAGS=$(LDFLAGS)" "CLIBS=$(CLIBS)" "MAKE=$(MAKE)" \ 
    41     "MAKEFLAGS=$(MAKEFLAGS)") 
     41    "MAKEFLAGS=$(MAKEFLAGS)" "SQL_CFLAGS=$(SQL_CFLAGS)" \ 
     42    "SQL_LDFLAGS=$(SQL_LDFLAGS)") 
    4243    @echo "If the make was successful, use 'make install' to install links." 
    4344 

  • 1.8.3/branches/devel/src/Makefile.in

    r979 r1019  
    77OUTFILES=buildinf netmud info_slave 
    88 
    9 # stupid SYS V shell 
    10  
    11 # for lint target 
    12 LINT=lint 
    13 LINTFLAGS=-haz $(DEFINES) 
    14 LINTFILT=egrep -v '(possible pointer|long assign|not yet im|:$$)' 
    15  
    16 # Libs 
    17 LIBS=$(CLIBS) $(RLIBS) $(ILIBS) 
    18  
    19 CFLAGS=$(CCFLAGS) $(RDEFS) $(IDEFS) 
    20  
    21 # Used for protoizing 
    22 #.c.o: 
    23 #   $(CC) $(CFLAGS) -aux-info $<.X -c $< 
     9# Libs EXCEPT for SQL ones 
     10LIBS=$(CLIBS) 
     11 
     12CFLAGS=$(CCFLAGS) $(SQL_CFLAGS) 
    2413 
    2514# List of C files, used for make depend: 
    26 C_FILES=access.c atr_tab.c attrib.c boolexp.c bsd.c bufferq.c \ 
    27     chunk.c cmdlocal.c cmds.c \ 
    28     command.c compress.c conf.c cque.c create.c db.c destroy.c extchat.c \ 
    29     extmail.c filecopy.c flaglocal.c flags.c funcrypt.c function.c \ 
    30     fundb.c funlist.c funlocal.c funmath.c funmisc.c funstr.c funtime.c \ 
    31     funufun.c game.c help.c htab.c ident.c local.c lock.c log.c look.c \ 
    32     malias.c markup.c match.c memcheck.c move.c mycrypt.c mymalloc.c \ 
    33     mysocket.c myrlimit.c myssl.c notify.c parse.c pcre.c player.c \ 
    34     plyrlist.c predicat.c privtab.c info_master.c \ 
    35     ptab.c rob.c services.c set.c shs.c sig.c sort.c speech.c sql.c \ 
    36     strdup.c strtree.c \ 
    37     strutil.c tables.c timer.c unparse.c utils.c version.c wait.c \ 
     15C_FILES=access.c atr_tab.c attrib.c boolexp.c bsd.c bufferq.c chunk.c   \ 
     16    cmdlocal.c cmds.c command.c compress.c conf.c cque.c create.c   \ 
     17    db.c destroy.c extchat.c extmail.c filecopy.c flaglocal.c   \ 
     18    flags.c funcrypt.c function.c fundb.c funlist.c funlocal.c  \ 
     19    funmath.c funmisc.c funstr.c funtime.c funufun.c game.c help.c  \ 
     20    htab.c ident.c local.c lock.c log.c look.c malias.c markup.c    \ 
     21    match.c memcheck.c move.c mycrypt.c mymalloc.c mysocket.c   \ 
     22    myrlimit.c myssl.c notify.c parse.c pcre.c player.c plyrlist.c  \ 
     23    predicat.c privtab.c info_master.c ptab.c rob.c services.c  \ 
     24    set.c shs.c sig.c sort.c speech.c sql.c strdup.c strtree.c  \ 
     25    strutil.c tables.c timer.c unparse.c utils.c version.c wait.c   \ 
    3826    warnings.c wild.c wiz.c 
    3927 
    4028 
    4129# .o versions of above - these are used in the build 
    42 O_FILES=access.o atr_tab.o attrib.o boolexp.o bsd.o bufferq.o \ 
    43     chunk.o cmdlocal.o cmds.o \ 
    44     command.o compress.o conf.o cque.o create.o db.o destroy.o extchat.o \ 
    45     extmail.o filecopy.o flaglocal.o flags.o funcrypt.o function.o \ 
    46     fundb.o funlist.o funlocal.o funmath.o funmisc.o funstr.o funtime.o \ 
    47     funufun.o game.o help.o htab.o ident.o local.o lock.o log.o look.o \ 
    48     malias.o markup.o match.o memcheck.o move.o mycrypt.o mymalloc.o \ 
    49     mysocket.o myrlimit.o myssl.o notify.o parse.o pcre.o player.o \ 
    50     plyrlist.o info_master.o predicat.o privtab.o \ 
    51     ptab.o rob.o services.o set.o shs.o sig.o sort.o speech.o sql.o \ 
    52     strdup.o strtree.o \ 
    53     strutil.o tables.o timer.o unparse.o utils.o version.o wait.o \ 
     30O_FILES=access.o atr_tab.o attrib.o boolexp.o bsd.o bufferq.o chunk.o   \ 
     31    cmdlocal.o cmds.o command.o compress.o conf.o cque.o create.o   \ 
     32    db.o destroy.o extchat.o extmail.o filecopy.o flaglocal.o   \ 
     33    flags.o funcrypt.o function.o fundb.o funlist.o funlocal.o  \ 
     34    funmath.o funmisc.o funstr.o funtime.o funufun.o game.o help.o  \ 
     35    htab.o ident.o local.o lock.o log.o look.o malias.o markup.o    \ 
     36    match.o memcheck.o move.o mycrypt.o mymalloc.o mysocket.o   \ 
     37    myrlimit.o myssl.o notify.o parse.o pcre.o player.o plyrlist.o  \ 
     38    info_master.o predicat.o privtab.o ptab.o rob.o services.o  \ 
     39    set.o shs.o sig.o sort.o speech.o sql.o strdup.o strtree.o  \ 
     40    strutil.o tables.o timer.o unparse.o utils.o version.o wait.o   \ 
    5441    warnings.o wild.o wiz.o 
    5542 
    …… 
    6552    @echo "Making netmud." 
    6653    -mv -f netmud netmud~ 
    67     $(CC) $(CCFLAGS) -o netmud $(O_FILES) $(LDFLAGS) $(LIBS)  
    68  
    69 # By default, db.c initially allocates enough space for 5000 objects, then 
    70 #   grows the space if needed.  To change this value, include 
    71 #   -DDB_INITIAL_SIZE=xxxx where xxxx is the new value (minimum 1). 
    72  
     54    $(CC) $(CCFLAGS) -o netmud $(O_FILES) $(LDFLAGS) $(SQL_LDFLAGS) $(LIBS)  
    7355 
    7456# We recompile mysocket.c instead of reusing mysocket.o because we 
    7557# want to do some error handing differently for info_slave. 
    76 info_slave: info_slave.c ident.o strdup.o sig.o wait.o mysocket.c \ 
    77     ../hdrs/lookup.h 
     58info_slave: info_slave.c ident.o strdup.o sig.o wait.o mysocket.c ../hdrs/lookup.h 
    7859    @echo "Making info_slave." 
    79     $(CC) $(CCFLAGS) $(IDEFS) -c info_slave.c 
     60    $(CC) $(CCFLAGS) -c info_slave.c 
    8061    $(CC) $(CCFLAGS) -DINFOSLAVE -o info_slave info_slave.o \ 
    8162    ident.o strdup.o sig.o wait.o mysocket.c $(LDFLAGS) $(LIBS) 
    …… 
    8465ssl_slave: ssl_slave.c $(SSL_SLAVE_OBJS) 
    8566    @echo "Making ssl_slave." 
    86     $(CC) $(CCFLAGS) $(IDEFS) -c ssl_slave.c 
     67    $(CC) $(CCFLAGS) -c ssl_slave.c 
    8768    $(CC) $(CCFLAGS) -o ssl_slave ssl_slave.o \ 
    8869    $(SSL_SLAVE_OBJS) $(LDFLAGS) $(LIBS) 
    …… 
    9475    @echo "#define BUILDDATE \"`date`\"" >> ../hdrs/buildinf.h 
    9576    @echo "#define COMPILER \"$(CC)\"" >> ../hdrs/buildinf.h 
    96     @echo "#define CCFLAGS \"$(CCFLAGS)\"" >> ../hdrs/buildinf.h 
    97     @echo "#define RDEFS \"$(RDEFS)\"" >> ../hdrs/buildinf.h 
    98     @echo "#define IDEFS \"$(IDEFS)\"" >> ../hdrs/buildinf.h 
     77    @echo "#define CCFLAGS \"$(CFLAGS)\"" >> ../hdrs/buildinf.h 
    9978 
    10079# If funlocal.c doesn't exist, we want to build it from