Changeset 19875

Timestamp:

2009-06-22T13:52:35+12:00 (15 years ago)

Author:

kjdon

Message:

making common-src compile independently of gsdl or gs2build (for gs3) so modified makefiles to look for things in common-src dir rather than one level up

Location:

gsdl/trunk/common-src/src

Files:

• getpw/Makefile.in (modified) (1 diff)
• getpw/win32.mak (modified) (2 diffs)
• lib/Makefile.in (modified) (2 diffs)
• lib/gsdlconf.h (modified) (1 diff)
• lib/win32.mak (modified) (2 diffs)

gsdl/trunk/common-src/src/getpw/Makefile.in

@@ -31 +31 @@
 DEFS = @DEFS@
 GSDLOS = @gsdlos@
-INCLUDES = -I$(GSDL_DIR) -I$(COMMON_DIR)/src/lib
+INCLUDES = -I$(COMMON_DIR) -I$(COMMON_DIR)/src/lib
 INSTALL = @INSTALL@
 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@

gsdl/trunk/common-src/src/getpw/win32.mak

@@ -25 +25 @@
 ###########################################################################
 
-GSDL_DIR = ..\..\..
-COMMON_DIR = $(GSDLHOME)\common-src
+COMMON_DIR = ..\..
 
 COMMON_PACKAGES_DIR = $(COMMON_DIR)\packages
@@ -61 +60 @@
 CC = cl
 DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE
-INCLUDES = -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COMMON_DIR)\packages\windows\crypt\crypt"
+INCLUDES = -I"$(COMMON_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COMMON_DIR)\packages\windows\crypt\crypt"
 LIBS = "$(COMMON_DIR)\src\lib\gsdllib.lib" "$(COMMON_DIR)\packages\windows\crypt\crypt\crypt.lib"
 

gsdl/trunk/common-src/src/lib/Makefile.in

@@ -25 +25 @@
 ###########################################################################
 
-GSDL_DIR = ../../..
-COMMON_DIR = $(GSDL_DIR)/common-src
+#GSDL_DIR = ../../..
+COMMON_DIR = ../../
 
 INDEXERS_DIR = $(COMMON_DIR)/indexers
@@ -48 +48 @@
 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@
 DEFS = @DEFS@
-INCLUDES = -I. -I$(GSDL_DIR) -I$(COMMON_PACKAGES_DIR)/gdbm/include -I$(INDEXERS_DIR)/mg/lib $(SQLITE_INCLUDES)
+INCLUDES = -I. -I$(COMMON_DIR) -I$(COMMON_PACKAGES_DIR)/gdbm/include -I$(INDEXERS_DIR)/mg/lib $(SQLITE_INCLUDES)
 RANLIB = @RANLIB@
 

gsdl/trunk/common-src/src/lib/gsdlconf.h

@@ -37 +37 @@
 
 #if defined(__WIN32__) && !defined(__CYGWIN__)
-#include "../../../win32cfg.h"
+#include "../../win32cfg.h"
 #else
-#include "../../../config.h"
+#include "../../config.h"
 #endif
 

gsdl/trunk/common-src/src/lib/win32.mak

@@ -25 +25 @@
 ###########################################################################
 
-GSDL_DIR = ..\..\..
-COMMON_DIR = $(GSDLHOME)\common-src
+COMMON_DIR = ..\..
 
 INDEXERS_DIR = $(COMMON_DIR)\indexers
@@ -83 +82 @@
 CC = cl
 DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE
-INCLUDES = -I"$(GSDL_DIR)" -I"$(INDEXERS_DIR)\mg\lib" \
+INCLUDES = -I"$(COMMON_DIR)" -I"$(INDEXERS_DIR)\mg\lib" \
     -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3" -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\windows" \
     $(SQLITE_INCLUDES)