From: helge <helge@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Date: Wed, 23 Mar 2005 14:33:59 +0000 (+0000)
Subject: fixed compilation with SOPE HEAD
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a55b97a39e44460bb97a14f3d89fd8838643080;p=sope

fixed compilation with SOPE HEAD


git-svn-id: http://svn.opengroupware.org/SOPE/trunk@692 e4a50df8-12e2-0310-a44c-efbce7f8a7e3
---

diff --git a/Recycler/SxComponents/ChangeLog b/Recycler/SxComponents/ChangeLog
index 66051ec9..dc73cdd6 100644
--- a/Recycler/SxComponents/ChangeLog
+++ b/Recycler/SxComponents/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-23  Helge Hess  <helge.hess@skyrix.com>
+
+	* added FHS and config.make support, fixed compilation (v4.5.29)
+
 2004-08-20  Helge Hess  <helge.hess@opengroupware.org>
 
 	* moved to SOPE 4.3 (v4.3.28)
diff --git a/Recycler/SxComponents/GNUmakefile b/Recycler/SxComponents/GNUmakefile
index 73d19477..d0b32886 100644
--- a/Recycler/SxComponents/GNUmakefile
+++ b/Recycler/SxComponents/GNUmakefile
@@ -1,14 +1,19 @@
-# $Id$
+# GNUstep makefile
 
-include ../common.make
+-include ../../config.make
+include $(GNUSTEP_MAKEFILES)/common.make
+-include ../../Version
+include ./Version
 
 LIBRARY_NAME = libSxComponents
 TOOL_NAME = sxc_ls sxc_call
 
 libSxComponents_SOVERSION=$(MAJOR_VERSION).$(MINOR_VERSION)
+libSxComponents_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBMINOR_VERSION)
 
 libSxComponents_HEADER_FILES_DIR         = .
 libSxComponents_HEADER_FILES_INSTALL_DIR = /SxComponents
+FHS_HEADER_FILES_INSTALL_DIR = $(libSxComponents_HEADER_FILES_INSTALL_DIR)
 
 libSxComponents_HEADER_FILES =  	\
 	SxComponents.h			\
@@ -40,3 +45,4 @@ sxc_call_OBJC_FILES = sxc_call.m
 include $(GNUSTEP_MAKEFILES)/library.make
 include $(GNUSTEP_MAKEFILES)/tool.make
 -include GNUmakefile.postamble
+include fhs.make
diff --git a/Recycler/SxComponents/GNUmakefile.preamble b/Recycler/SxComponents/GNUmakefile.preamble
index 2fba2ffd..748a3b8d 100644
--- a/Recycler/SxComponents/GNUmakefile.preamble
+++ b/Recycler/SxComponents/GNUmakefile.preamble
@@ -1,17 +1,16 @@
-# $Id$
+# compilation settings
 
 libSxComponents_LIBRARIES_DEPEND_UPON = \
-	-lNGObjWeb -lXmlRpc -lNGJavaScript -lNGScripting \
+	-lNGObjWeb -lXmlRpc \
 	-lNGMime -lNGStreams -lNGExtensions -lEOControl \
 	-lDOM -lSaxObjC
 
 ADDITIONAL_TOOL_LIBS += \
-	-lSxComponents -lNGObjWeb -lNGMime \
-	 -lNGJavaScript -lNGScripting \
+	-lSxComponents -lNGObjWeb -lNGXmlRpc -lNGMime \
 	-lNGStreams -lNGExtensions -lEOControl \
 	-lXmlRpc -lDOM -lSaxObjC
 
-ADDITIONAL_INCLUDE_DIRS += -I../NGObjWeb
+ADDITIONAL_INCLUDE_DIRS += -I..
 
 ifneq ($(GNUSTEP_BUILD_DIR),)
 RELBUILD_DIR_JS=$(GNUSTEP_BUILD_DIR)/../../../ThirdParty/js-1.5
@@ -22,8 +21,6 @@ RELBUILD_DIR_SxXml=$(GNUSTEP_BUILD_DIR)/../../sope-xml
 ADDITIONAL_LIB_DIRS += \
 	-L$(GNUSTEP_OBJ_DIR)                                           	\
 	-L$(RELBUILD_DIR_SOPE)/NGObjWeb/$(GNUSTEP_OBJ_DIR_NAME)		\
-	-L$(RELBUILD_DIR_SOPE)/NGJavaScript/$(GNUSTEP_OBJ_DIR_NAME)	\
-	-L$(RELBUILD_DIR_SOPE)/NGScripting/$(GNUSTEP_OBJ_DIR_NAME)	\
 	-L$(RELBUILD_DIR_SxXml)/DOM/$(GNUSTEP_OBJ_DIR_NAME)
 else
 ADDITIONAL_LIB_DIRS += \
@@ -33,6 +30,8 @@ ADDITIONAL_LIB_DIRS += \
 	-L../NGScripting/$(GNUSTEP_OBJ_DIR)
 endif
 
+SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
+
 # Apple
 
 ifeq ($(FOUNDATION_LIB),apple)
diff --git a/Recycler/SxComponents/Version b/Recycler/SxComponents/Version
index 42d0a3b8..5afe0dc2 100644
--- a/Recycler/SxComponents/Version
+++ b/Recycler/SxComponents/Version
@@ -1,3 +1,3 @@
-# $Id$
+# Version
 
-SUBMINOR_VERSION:=28
+SUBMINOR_VERSION:=29
diff --git a/Recycler/SxComponents/fhs.make b/Recycler/SxComponents/fhs.make
new file mode 100644
index 00000000..8e576cd0
--- /dev/null
+++ b/Recycler/SxComponents/fhs.make
@@ -0,0 +1,44 @@
+# postprocessing
+
+# FHS support (this is a hack and is going to be done by gstep-make!)
+
+# NOTE: you need to define FHS_HEADER_FILES_INSTALL_DIR for one library
+
+ifneq ($(FHS_INSTALL_ROOT),)
+
+FHS_INCLUDE_DIR=$(FHS_INSTALL_ROOT)/include/
+FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib/
+FHS_BIN_DIR=$(FHS_INSTALL_ROOT)/bin/
+
+NONFHS_LIBDIR="$(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR)/"
+NONFHS_LIBNAME="$(LIBRARY_NAME)$(LIBRARY_NAME_SUFFIX)$(SHARED_LIBEXT)"
+NONFHS_BINDIR="$(GNUSTEP_TOOLS)/$(GNUSTEP_TARGET_LDIR)"
+
+
+fhs-header-dirs ::
+	$(MKDIRS) $(FHS_INCLUDE_DIR)$(FHS_HEADER_FILES_INSTALL_DIR)
+
+fhs-bin-dirs ::
+	$(MKDIRS) $(FHS_BIN_DIR)
+
+
+move-headers-to-fhs :: fhs-header-dirs
+	@echo "moving headers to $(FHS_INCLUDE_DIR) .."
+	mv $(GNUSTEP_HEADERS)$(FHS_HEADER_FILES_INSTALL_DIR)/*.h \
+	  $(FHS_INCLUDE_DIR)$(FHS_HEADER_FILES_INSTALL_DIR)/
+
+move-libs-to-fhs :: 
+	@echo "moving libs to $(FHS_LIB_DIR) .."
+	mv $(NONFHS_LIBDIR)/$(NONFHS_LIBNAME)* $(FHS_LIB_DIR)/
+
+move-tools-to-fhs :: fhs-bin-dirs
+	@echo "moving tools from $(NONFHS_BINDIR) to $(FHS_BIN_DIR) .."
+	for i in $(TOOL_NAME); do \
+	  mv "$(NONFHS_BINDIR)/$${i}" $(FHS_BIN_DIR); \
+	done
+
+move-to-fhs :: move-headers-to-fhs move-libs-to-fhs move-tools-to-fhs
+
+after-install :: move-to-fhs
+
+endif