Ignore:
Timestamp:
1999-09-09T17:42:38+12:00 (25 years ago)
Author:
sjboddie
Message:

screwy make fix

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/gsdl/src/recpt/Makefile.in

    r567 r568  
    3030DEFS = -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER \
    3131       -D_LITTLE_ENDIAN -DGSDLUSAGELOG @DEFS@
     32
     33USE_FASTCGI = @USE_FASTCGI@
     34ifneq ($(USE_FASTCGI), 1)
    3235INCLUDES = -I../../lib -I. -I../colservr -I../../packages/mg \
    3336       -I../../packages/mg/lib -I../../packages/mg/src/text
    34 USE_FASTCGI = @USE_FASTCGI@
    35 ifeq ($(USE_FASTCGI), 1)
    36 INCLUDES = $(INCLUDES) -I../../packages/fcgi/include
     37else
     38INCLUDES = -I../../lib -I. -I../colservr -I../../packages/mg \
     39       -I../../packages/mg/lib -I../../packages/mg/src/text \
     40           -I../../packages/fcgi/include
    3741endif
     42
    3843RANLIB = @RANLIB@
    3944LDFLAGS = @LDFLAGS@
    … …  
    130135# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
    131136
     137ifneq ($(USE_FASTCGI), 1)
    132138RECPT_OBJS = $(COMMONOBJECTS) $(RECPTOBJECTS) \
    133139    ../../lib/gsdllib.a  \
    134140    ../../packages/mg/src/text/libtextin.a \
    135141    ../../packages/mg/lib/libmg.a
    136 ifeq ($(USE_FASTCGI), 1)
    137 RECPT_OBJS = $(RECPT_OBJS) ../../packages/fcgi/libfcgi/libfcgi.a
     142else
     143RECPT_OBJS = $(COMMONOBJECTS) $(RECPTOBJECTS) \
     144    ../../lib/gsdllib.a  \
     145    ../../packages/mg/src/text/libtextin.a \
     146    ../../packages/mg/lib/libmg.a \
     147    ../../packages/fcgi/libfcgi/libfcgi.a
    138148endif
    139149
    … …  
    143153# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
    144154
     155ifneq ($(USE_FASTCGI), 1)
    145156LIBRARY_OBJS = $(COMMONOBJECTS) $(LIBRARYOBJECTS) $(COLSERVROBJECTS) \
    146157    ../../lib/gsdllib.a  \
    147158    ../../packages/mg/src/text/libtextin.a \
    148159    ../../packages/mg/lib/libmg.a
    149 ifeq ($(USE_FASTCGI), 1)
    150 LIBRARY_OBJS = $(LIBRARY_OBJS) ../../packages/fcgi/libfcgi/libfcgi.a
     160else
     161LIBRARY_OBJS = $(COMMONOBJECTS) $(LIBRARYOBJECTS) $(COLSERVROBJECTS) \
     162    ../../lib/gsdllib.a  \
     163    ../../packages/mg/src/text/libtextin.a \
     164    ../../packages/mg/lib/libmg.a \
     165    ../../packages/fcgi/libfcgi/libfcgi.a
    151166endif
    152167
Note: See TracChangeset for help on using the changeset viewer.