Changeset 19292

Show
Ignore:
Timestamp:
29.04.2009 23:15:32 (11 years ago)
Author:
davidb
Message:

Adjustment to -I flags to compile mod_gsdl.cpp/so so it can find the apr and apr-util files included in the apache-httpd source directory

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/runtime-src/src/recpt/Makefile.in

    r19261 r19292  
    7979APACHE_OBJS = string_pool.o mod_gsdl.o 
    8080 
    81 APXS=$(GSDL_DIR)/apache-httpd/$(GSDLOS)/bin/apxs 
    82 APXS_CFLAGS=`$(APXS) -q CFLAGS`    
    83 APXS_CFLAGS_SHLIB=`$(APXS) -q CFLAGS_SHLIB`    
    84 APXS_INCLUDEDIR=`$(APXS) -q INCLUDEDIR`    
    85 APXS_LIBEXECDIR=`$(APXS) -q LIBEXECDIR` 
    86 APXS_LDFLAGS_SHLIB=`$(APXS) -q LDFLAGS_SHLIB` 
    87 APXS_SYSCONFDIR=`$(APXS) -q SYSCONFDIR` 
    88 APXS_LIBS_SHLIB=`$(APXS) -q LIBS_SHLIB` 
     81APACHE_INSTDIR=$(GSDL_DIR)/apache-httpd/$(GSDLOS) 
     82APACHE_SRCLIBDIR=../../packages/apache-httpd/httpd-2.2.11/srclib 
     83 
     84APXS_CFLAGS=-I$(APACHE_INSTDIR)/include \ 
     85  -I$(APACHE_SRCLIBDIR)/apr/include -I$(APACHE_SRCLIBDIR)/apr-util/include 
     86 
     87APXS_LDFLAGS= -L$(APACHE_INSTDIR)/lib \ 
     88  -L$(APACHE_SRCLIBDIR)/apr/include -L$(APACHE_SRCLIBDIR)/apr-util/include 
     89 
    8990APACHE_MODULE = mod_gsdl.so 
    9091else 
    9192APACHE_OBJS = 
    92 APACHE_MODULE = mod_gsdl.so 
     93APACHE_MODULE = 
    9394endif 
    9495 
     
    235236 
    236237mod_gsdl.o: mod_gsdl.cpp 
    237     $(CXX) -c  $(CXXFLAGS) $(DEFS) $(INCLUDES) -D_APACHE_MOD=2 -fPIC -I$(APXS_INCLUDEDIR) -I. -iquote $(APXS_CFLAGS) $(APXS_CFLAGS_SHLIB) -Wall -o $@ $<  
     238    $(CXX) -c  $(CXXFLAGS) $(DEFS) $(INCLUDES) -D_APACHE_MOD=2 -fPIC $(APXS_CFLAGS) -Wall -o $@ $<  
    238239 
    239240mod_gsdl.so: $(APACHE_OBJS) $(LIBRARY) 
    240     $(CXX) -fPIC -shared -o $@ $(APACHE_OBJS) $(APXS_LIBS_SHLIB) $(LIBRARY) $(GSDL_LIBS) $(LIBS) 
     241    $(CXX) -fPIC -shared -o $@ $(APACHE_OBJS) $(LIBRARY) $(GSDL_LIBS) $(LIBS) 
    241242 
    242243