Changeset 16563 for gsdl/trunk/gs2runtime/src/recpt/Makefile.in

Timestamp:

2008-07-28T16:53:09+12:00 (16 years ago)

Author:

davidb

Message:

Mods to Makefile.in and configure.in to work with newly organized files: gs2build gs2common and gs2runtime

File:

• gsdl/trunk/gs2runtime/src/recpt/Makefile.in (modified) (4 diffs)

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

@@ -25 +25 @@
 ###########################################################################
 
-GSDL_DIR = ../..
-INDEXERS_DIR = $(GSDL_DIR)/indexers
-PACKAGES_DIR = $(GSDL_DIR)/packages
-COLSERVR_DIR = $(GSDL_DIR)/src/colservr
-PROTOCOL_DIR = $(GSDL_DIR)/src/protocol
-Z3950_DIR = $(GSDL_DIR)/src/z3950
+GSDL_DIR = ../../..
+COMMON_DIR = $(GSDL_DIR)/gs2common
+RUNTIME_DIR = $(GSDL_DIR)/gs2runtime
+
+INDEXERS_DIR = $(COMMON_DIR)/indexers
+PACKAGES_DIR = $(RUNTIME_DIR)/packages
+COLSERVR_DIR = $(RUNTIME_DIR)/src/colservr
+PROTOCOL_DIR = $(RUNTIME_DIR)/src/protocol
+Z3950_DIR = $(RUNTIME_DIR)/src/z3950
 
 
@@ -53 +56 @@
 USE_SQLITE = @USE_SQLITE@
 ifeq ($(USE_SQLITE), 1)
-SQLITE_LIBS = $(PACKAGES_DIR)/sqlite/lib/libsqlite3.a -ldl -lpthread
+SQLITE_LIBS = $(COMMON_DIR)/packages/sqlite/lib/libsqlite3.a -ldl -lpthread
 else
 SQLITE_LIBS = 
@@ -76 +79 @@
 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@
 DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DHAVE_CONFIG_H $(FASTCGI_DEFS) $(Z3950_DEFS)
-INCLUDES = @GDBM_INCLUDE@ -I. -I$(GSDL_DIR) -I$(GSDL_DIR)/src/lib \
+INCLUDES = @GDBM_INCLUDE@ -I. -I$(GSDL_DIR) -I$(COMMON_DIR)/src/lib \
         -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) \
     -I$(INDEXERS_DIR)/mg -I$(INDEXERS_DIR)/mg/lib -I$(INDEXERS_DIR)/mgpp/text \
@@ -194 +197 @@
     $(INDEXERS_DIR)/mgpp/text/libmgpptext.a \
     $(INDEXERS_DIR)/mgpp/lib/libmgpplib.a \
-    $(GSDL_DIR)/src/lib/gsdllib.a
+    $(COMMON_DIR)/src/lib/gsdllib.a
 
 EXECUTABLE_OBJECTS = \