Changeset 18224 for gsdl/trunk/runtime-src

Timestamp:

2008-12-17T14:32:32+13:00 (15 years ago)

Author:

mdewsnip

Message:

GRRRR -- fixed up a whole lot more inconsistencies in the Makefiles. These were all perfect before the build-src/common-src/runtime-src split!!

Location:

gsdl/trunk/runtime-src/src

Files:

• colservr/Makefile.in (modified) (4 diffs)
• protocol/Makefile.in (modified) (3 diffs)
• recpt/Makefile.in (modified) (3 diffs)

gsdl/trunk/runtime-src/src/colservr/Makefile.in

@@ -1 +1 @@
 ###########################################################################
 #
-# Makefile -- src/colservr
+# Makefile -- runtime-src/src/colservr
 # A component of the Greenstone digital library software
 # from the New Zealand Digital Library Project at the
@@ -29 +29 @@
 
 INDEXERS_DIR = $(COMMON_DIR)/indexers
-COMMON_PACKAGES = $(COMMON_DIR)/packages
-PACKAGES_DIR = $(GSDL_DIR)/runtime-src/packages
+COMMON_PACKAGES_DIR = $(COMMON_DIR)/packages
 
 
@@ -36 +35 @@
 ifeq ($(USE_SQLITE), 1)
 SQLITE_DEFINES = -DUSE_SQLITE
-SQLITE_INCLUDES = -I$(COMMON_PACKAGES)/sqlite/include
+SQLITE_INCLUDES = -I$(COMMON_PACKAGES_DIR)/sqlite/include
 else
 SQLITE_DEFINES = 
@@ -50 +49 @@
 DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER $(SQLITE_DEFINES)
 # Do NOT add the "recpt" directory here: the colserver should be independent of the receptionist!
-INCLUDES = @GDBM_INCLUDE@ -I. -I$(GSDL_DIR) -I$(COMMON_DIR)/src/lib \
+INCLUDES = -I. -I$(GSDL_DIR) -I$(COMMON_DIR)/src/lib -I$(COMMON_PACKAGES_DIR)/gdbm/include \
     -I$(INDEXERS_DIR)/mg -I$(INDEXERS_DIR)/mg/lib -I$(INDEXERS_DIR)/mg/src/text \
     -I$(INDEXERS_DIR)/mgpp/lib -I$(INDEXERS_DIR)/mgpp/text \
-    -I$(PACKAGES_DIR)/expat/include $(SQLITE_INCLUDES)
+    -I$(COMMON_PACKAGES_DIR)/expat/include $(SQLITE_INCLUDES)
 RANLIB = @RANLIB@
 

gsdl/trunk/runtime-src/src/protocol/Makefile.in

@@ -1 +1 @@
 ###########################################################################
 #
-# Makefile -- src/protocol
+# Makefile -- runtime-src/src/protocol
 # A component of the Greenstone digital library software
 # from the New Zealand Digital Library Project at the
@@ -27 +27 @@
 GSDL_DIR = ../../..
 COMMON_DIR = $(GSDL_DIR)/common-src
+RUNTIME_DIR = $(GSDL_DIR)/runtime-src
 
 INDEXERS_DIR = $(COMMON_DIR)/indexers
-PACKAGES_DIR = $(GSDL_DIR)/runtime-src/packages
-COLSERVR_DIR = $(GSDL_DIR)/runtime-src/src/colservr
+COMMON_PACKAGES_DIR = $(COMMON_DIR)/packages
+COLSERVR_DIR = $(RUNTIME_DIR)/src/colservr
 
 
@@ -38 +39 @@
 DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER
 # Do NOT add the "recpt" directory here: the protocol should be independent of the receptionist!
-INCLUDES = @GDBM_INCLUDE@ -I. -I$(GSDL_DIR) -I$(COMMON_DIR)/src/lib -I$(COLSERVR_DIR) -I$(INDEXERS_DIR)/mgpp/text
+INCLUDES = -I. -I$(GSDL_DIR) -I$(COMMON_DIR)/src/lib -I$(COMMON_PACKAGES_DIR)/gdbm/include \
+    -I$(COLSERVR_DIR) -I$(INDEXERS_DIR)/mgpp/text
 RANLIB = @RANLIB@
 

gsdl/trunk/runtime-src/src/recpt/Makefile.in

@@ -1 +1 @@
 ###########################################################################
 #
-# Makefile -- src/recpt
+# Makefile -- runtime-src/src/recpt
 # A component of the Greenstone digital library software
 # from the New Zealand Digital Library Project at the
@@ -80 +80 @@
 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$(COMMON_DIR)/src/lib \
+INCLUDES = -I. -I$(GSDL_DIR) -I$(COMMON_DIR)/src/lib -I$(COMMON_PACKAGES_DIR)/gdbm/include \
         -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) \
     -I$(INDEXERS_DIR)/mg -I$(INDEXERS_DIR)/mg/lib -I$(INDEXERS_DIR)/mgpp/text \
@@ -86 +86 @@
 INSTALL = @INSTALL@
 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
-LIBS = @LIBS@ $(COMMON_PACKAGES_DIR)/gdbm/lib/libgdbm.a -L$(COMMON_PACKAGES_DIR)/expat/lib -lexpat $(ACCENTFOLD_LIBS) \
-    $(FASTCGI_LIBS) $(SQLITE_LIBS) $(Z3950_LIBS)
+LIBS = @LIBS@ $(COMMON_PACKAGES_DIR)/gdbm/lib/libgdbm.a -L$(COMMON_PACKAGES_DIR)/expat/lib -lexpat \
+    $(ACCENTFOLD_LIBS) $(FASTCGI_LIBS) $(SQLITE_LIBS) $(Z3950_LIBS)
 RANLIB = @RANLIB@