Changeset 22627


Ignore:
Timestamp:
2010-08-13T13:40:52+12:00 (14 years ago)
Author:
mdewsnip
Message:

Updated runtime-src/src/recpt/Makefile.am to compile the new basequeryaction and sqlqueryaction classes.

Location:
main/trunk/gs2-core/runtime-src/src/recpt
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • main/trunk/gs2-core/runtime-src/src/recpt/Makefile.am

    r21539 r22627  
    4646    argdb.cpp \
    4747    authenaction.cpp \
     48    basequeryaction.cpp \
    4849    browseaction.cpp \
    4950    browseactiontools.cpp \
    … …  
    7980    querytools.cpp \
    8081    receptionist.cpp \
     82    sqlqueryaction.cpp \
    8183    statusaction.cpp \
    8284    string_pool.cpp \
    … …  
    102104# Option: SQLite support
    103105if USE_SQLITE
     106  library_cgi_CPPFLAGS += -I$(GSDL_DIR)/common-src/packages/sqlite/include
    104107  library_cgi_LDADD += $(GSDL_DIR)/common-src/packages/sqlite/lib/libsqlite3.a -ldl -lpthread
    105108endif

  • main/trunk/gs2-core/runtime-src/src/recpt/Makefile.in

    r21539 r22627  
    6969
    7070# Option: SQLite support
    71 @USE_SQLITE_TRUE@am__append_2 = $(GSDL_DIR)/common-src/packages/sqlite/lib/libsqlite3.a -ldl -lpthread
     71@USE_SQLITE_TRUE@am__append_2 = -I$(GSDL_DIR)/common-src/packages/sqlite/include
     72@USE_SQLITE_TRUE@am__append_3 = $(GSDL_DIR)/common-src/packages/sqlite/lib/libsqlite3.a -ldl -lpthread
    7273subdir = src/recpt
    7374DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
    … …  
    8485am_library_cgi_OBJECTS = library_cgi-action.$(OBJEXT) \
    8586    library_cgi-argdb.$(OBJEXT) library_cgi-authenaction.$(OBJEXT) \
     87    library_cgi-basequeryaction.$(OBJEXT) \
    8688    library_cgi-browseaction.$(OBJEXT) \
    8789    library_cgi-browseactiontools.$(OBJEXT) \
    … …  
    115117    library_cgi-querytools.$(OBJEXT) \
    116118    library_cgi-receptionist.$(OBJEXT) \
     119    library_cgi-sqlqueryaction.$(OBJEXT) \
    117120    library_cgi-statusaction.$(OBJEXT) \
    118121    library_cgi-string_pool.$(OBJEXT) \
    … …  
    240243
    241244# Program: library.cgi
    242 library_cgi_CPPFLAGS = \
    243     -I$(GSDL_DIR)/common-src/src/lib \
     245library_cgi_CPPFLAGS = -I$(GSDL_DIR)/common-src/src/lib \
    244246    -I$(GSDL_DIR)/runtime-src/src/colservr \
    245     -I$(GSDL_DIR)/runtime-src/src/protocol \
    246     $(COMPAT32BITFLAGS)
    247 
     247    -I$(GSDL_DIR)/runtime-src/src/protocol $(COMPAT32BITFLAGS) \
     248    $(am__append_2)
    248249
    249250# Sources for library.cgi
    … …  
    252253    argdb.cpp \
    253254    authenaction.cpp \
     255    basequeryaction.cpp \
    254256    browseaction.cpp \
    255257    browseactiontools.cpp \
    … …  
    285287    querytools.cpp \
    286288    receptionist.cpp \
     289    sqlqueryaction.cpp \
    287290    statusaction.cpp \
    288291    string_pool.cpp \
    … …  
    298301    $(GSDL_DIR)/runtime-src/src/colservr/libgsdlcolservr.a \
    299302    $(GSDL_DIR)/common-src/src/lib/libgsdllib.a $(am__append_1) \
    300     $(am__append_2)
     303    $(am__append_3)
    301304library_cgi_LDFLAGS = $(COMPAT32BITFLAGS)
    302305all: all-am
    … …  
    369372@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/library_cgi-argdb.Po@am__quote@
    370373@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/library_cgi-authenaction.Po@am__quote@
     374@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/library_cgi-basequeryaction.Po@am__quote@
    371375@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/library_cgi-browseaction.Po@am__quote@
    372376@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/library_cgi-browseactiontools.Po@am__quote@
    … …  
    402406@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/library_cgi-querytools.Po@am__quote@
    403407@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/library_cgi-receptionist.Po@am__quote@
     408@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/library_cgi-sqlqueryaction.Po@am__quote@
    404409@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/library_cgi-statusaction.Po@am__quote@
    405410@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/library_cgi-string_pool.Po@am__quote@
    … …  
    467472@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(library_cgi_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o library_cgi-authenaction.obj `if test -f 'authenaction.cpp'; then $(CYGPATH_W) 'authenaction.cpp'; else $(CYGPATH_W) '$(srcdir)/authenaction.cpp'; fi`
    468473
     474library_cgi-basequeryaction.o: basequeryaction.cpp
     475@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(library_cgi_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT library_cgi-basequeryaction.o -MD -MP -MF "$(DEPDIR)/library_cgi-basequeryaction.Tpo" -c -o library_cgi-basequeryaction.o `test -f 'basequeryaction.cpp' || echo '$(srcdir)/'`basequeryaction.cpp; \
     476@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/library_cgi-basequeryaction.Tpo" "$(DEPDIR)/library_cgi-basequeryaction.Po"; else rm -f "$(DEPDIR)/library_cgi-basequeryaction.Tpo"; exit 1; fi
     477@AMDEP_TRUE@@am__fastdepCXX_FALSE@  source='basequeryaction.cpp' object='library_cgi-basequeryaction.o' libtool=no @AMDEPBACKSLASH@
     478@AMDEP_TRUE@@am__fastdepCXX_FALSE@  DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     479@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(library_cgi_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o library_cgi-basequeryaction.o `test -f 'basequeryaction.cpp' || echo '$(srcdir)/'`basequeryaction.cpp
     480
     481library_cgi-basequeryaction.obj: basequeryaction.cpp
     482@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(library_cgi_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT library_cgi-basequeryaction.obj -MD -MP -MF "$(DEPDIR)/library_cgi-basequeryaction.Tpo" -c -o library_cgi-basequeryaction.obj `if test -f 'basequeryaction.cpp'; then $(CYGPATH_W) 'basequeryaction.cpp'; else $(CYGPATH_W) '$(srcdir)/basequeryaction.cpp'; fi`; \
     483@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/library_cgi-basequeryaction.Tpo" "$(DEPDIR)/library_cgi-basequeryaction.Po"; else rm -f "$(DEPDIR)/library_cgi-basequeryaction.Tpo"; exit 1; fi
     484@AMDEP_TRUE@@am__fastdepCXX_FALSE@  source='basequeryaction.cpp' object='library_cgi-basequeryaction.obj' libtool=no @AMDEPBACKSLASH@
     485@AMDEP_TRUE@@am__fastdepCXX_FALSE@  DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     486@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(library_cgi_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o library_cgi-basequeryaction.obj `if test -f 'basequeryaction.cpp'; then $(CYGPATH_W) 'basequeryaction.cpp'; else $(CYGPATH_W) '$(srcdir)/basequeryaction.cpp'; fi`
     487
    469488library_cgi-browseaction.o: browseaction.cpp
    470489@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(library_cgi_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT library_cgi-browseaction.o -MD -MP -MF "$(DEPDIR)/library_cgi-browseaction.Tpo" -c -o library_cgi-browseaction.o `test -f 'browseaction.cpp' || echo '$(srcdir)/'`browseaction.cpp; \
    … …  
    928947@AMDEP_TRUE@@am__fastdepCXX_FALSE@  DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    929948@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(library_cgi_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o library_cgi-receptionist.obj `if test -f 'receptionist.cpp'; then $(CYGPATH_W) 'receptionist.cpp'; else $(CYGPATH_W) '$(srcdir)/receptionist.cpp'; fi`
     949
     950library_cgi-sqlqueryaction.o: sqlqueryaction.cpp
     951@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(library_cgi_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT library_cgi-sqlqueryaction.o -MD -MP -MF "$(DEPDIR)/library_cgi-sqlqueryaction.Tpo" -c -o library_cgi-sqlqueryaction.o `test -f 'sqlqueryaction.cpp' || echo '$(srcdir)/'`sqlqueryaction.cpp; \
     952@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/library_cgi-sqlqueryaction.Tpo" "$(DEPDIR)/library_cgi-sqlqueryaction.Po"; else rm -f "$(DEPDIR)/library_cgi-sqlqueryaction.Tpo"; exit 1; fi
     953@AMDEP_TRUE@@am__fastdepCXX_FALSE@  source='sqlqueryaction.cpp' object='library_cgi-sqlqueryaction.o' libtool=no @AMDEPBACKSLASH@
     954@AMDEP_TRUE@@am__fastdepCXX_FALSE@  DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     955@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(library_cgi_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o library_cgi-sqlqueryaction.o `test -f 'sqlqueryaction.cpp' || echo '$(srcdir)/'`sqlqueryaction.cpp
     956
     957library_cgi-sqlqueryaction.obj: sqlqueryaction.cpp
     958@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(library_cgi_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT library_cgi-sqlqueryaction.obj -MD -MP -MF "$(DEPDIR)/library_cgi-sqlqueryaction.Tpo" -c -o library_cgi-sqlqueryaction.obj `if test -f 'sqlqueryaction.cpp'; then $(CYGPATH_W) 'sqlqueryaction.cpp'; else $(CYGPATH_W) '$(srcdir)/sqlqueryaction.cpp'; fi`; \
     959@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/library_cgi-sqlqueryaction.Tpo" "$(DEPDIR)/library_cgi-sqlqueryaction.Po"; else rm -f "$(DEPDIR)/library_cgi-sqlqueryaction.Tpo"; exit 1; fi
     960@AMDEP_TRUE@@am__fastdepCXX_FALSE@  source='sqlqueryaction.cpp' object='library_cgi-sqlqueryaction.obj' libtool=no @AMDEPBACKSLASH@
     961@AMDEP_TRUE@@am__fastdepCXX_FALSE@  DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     962@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(library_cgi_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o library_cgi-sqlqueryaction.obj `if test -f 'sqlqueryaction.cpp'; then $(CYGPATH_W) 'sqlqueryaction.cpp'; else $(CYGPATH_W) '$(srcdir)/sqlqueryaction.cpp'; fi`
    930963
    931964library_cgi-statusaction.o: statusaction.cpp
Note: See TracChangeset for help on using the changeset viewer.