fixed NGObjDOM compilation against SOPE HEAD

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

diff --git a/Recycler/NGObjDOM/ChangeLog b/Recycler/NGObjDOM/ChangeLog
index 1d96ab3625d5faea3fb4a93118c6915d1ee3bc9d..09de104898f5582b3befaecf7543ee1c894dac20 100644 (file)
--- a/Recycler/NGObjDOM/ChangeLog
+++ b/Recycler/NGObjDOM/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-23  Helge Hess  <helge.hess@skyrix.com>
+
+       * added FHS and config.make support, fixed compilation (v4.5.26)
+
 2004-08-20  Helge Hess  <helge.hess@opengroupware.org>
 
        * deprecated and moved to Recycler

diff --git a/Recycler/NGObjDOM/Dynamic.subproj/GNUmakefile b/Recycler/NGObjDOM/Dynamic.subproj/GNUmakefile
index 96988713af2031f17266ce8ff79093b4a6e351b4..2c6e9b5b538bff786e94a31d7d6befb4cf0f35ac 100644 (file)
--- a/Recycler/NGObjDOM/Dynamic.subproj/GNUmakefile
+++ b/Recycler/NGObjDOM/Dynamic.subproj/GNUmakefile
@@ -1,6 +1,9 @@
-# $Id$
+# GNUstep makefile
 
+-include ../../../config.make
 include $(GNUSTEP_MAKEFILES)/common.make
+-include ../../../Version
+include ../Version
 
 SUBPROJECT_NAME = Dynamic
 

diff --git a/Recycler/NGObjDOM/GNUmakefile b/Recycler/NGObjDOM/GNUmakefile
index 85fa5e6e86884f972f701c334165c5f79ef51e7b..e70ce5b2841e37de82dab231f40ed5b0ce29403d 100644 (file)
--- a/Recycler/NGObjDOM/GNUmakefile
+++ b/Recycler/NGObjDOM/GNUmakefile
@@ -1,6 +1,9 @@
-# $Id$
+# GNUstep makefile
 
-include ../common.make
+-include ../../config.make
+include $(GNUSTEP_MAKEFILES)/common.make
+-include ../../Version
+include ./Version
 
 GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_LOCAL_ROOT)
 
@@ -13,7 +16,9 @@ SUBPROJECTS = XUL.subproj XHTML.subproj
 
 libNGObjDOM_HEADER_FILES_DIR         = .
 libNGObjDOM_HEADER_FILES_INSTALL_DIR = /NGObjDOM
+FHS_HEADER_FILES_INSTALL_DIR = $(libNGObjDOM_HEADER_FILES_INSTALL_DIR)
 libNGObjDOM_SOVERSION=$(MAJOR_VERSION).$(MINOR_VERSION)
+libNGObjDOM_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBMINOR_VERSION)
 
 libNGObjDOM_HEADER_FILES = \
        NGObjDOM.h                      \
@@ -61,3 +66,4 @@ include $(GNUSTEP_MAKEFILES)/library.make
 include $(GNUSTEP_MAKEFILES)/bundle.make
 include $(GNUSTEP_MAKEFILES)/aggregate.make
 -include GNUmakefile.postamble
+include fhs.make

diff --git a/Recycler/NGObjDOM/GNUmakefile.preamble b/Recycler/NGObjDOM/GNUmakefile.preamble
index 6b78d181bdfe754fb2ec5d99ac401c83458aba1b..8a7a50bd8a1621076027435be5ff3f198b3745c7 100644 (file)
--- a/Recycler/NGObjDOM/GNUmakefile.preamble
+++ b/Recycler/NGObjDOM/GNUmakefile.preamble
@@ -1,7 +1,10 @@
-# $Id$
+# compilation settings
+
+#libNGObjDOM_LIBRARIES_DEPEND_UPON += \
+#        -lNGScripting
 
 libNGObjDOM_LIBRARIES_DEPEND_UPON += \
-        -lNGObjWeb -lNGScripting \
+        -lNGObjWeb \
        -lNGMime -lNGStreams -lNGExtensions -lEOControl \
        -lXmlRpc -lDOM -lSaxObjC
 
@@ -40,6 +43,8 @@ ADDITIONAL_CPPFLAGS += -pipe -Wall
 
 NGObjDOM_BUNDLE_LIBS += -lNGObjDOM
 
+SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
+
 
 # Apple
 

diff --git a/Recycler/NGObjDOM/Version b/Recycler/NGObjDOM/Version
index ff5cc35fcaf96c5fc3004b7d20815ace606ea146..ab026c50e3af0de7841a80affbdaa75f5395b54b 100644 (file)
--- a/Recycler/NGObjDOM/Version
+++ b/Recycler/NGObjDOM/Version
@@ -1,3 +1,3 @@
-# $Id$
+# Version
 
 SUBMINOR_VERSION:=25
\ No newline at end of file

diff --git a/Recycler/NGObjDOM/XHTML.subproj/GNUmakefile b/Recycler/NGObjDOM/XHTML.subproj/GNUmakefile
index 00692826cbe574bb77a2683ce3b41c1240ecd1e7..12e740b6970c8dcc968e482c354f40acb416c751 100644 (file)
--- a/Recycler/NGObjDOM/XHTML.subproj/GNUmakefile
+++ b/Recycler/NGObjDOM/XHTML.subproj/GNUmakefile
@@ -1,6 +1,9 @@
-# $Id$
+# GNUstep makefile
 
+-include ../../../config.make
 include $(GNUSTEP_MAKEFILES)/common.make
+-include ../../../Version
+include ../Version
 
 BUNDLE_NAME        = XHTML
 BUNDLE_EXTENSION   = .odr

diff --git a/Recycler/NGObjDOM/XHTML.subproj/GNUmakefile.preamble b/Recycler/NGObjDOM/XHTML.subproj/GNUmakefile.preamble
index 7bca8edfca3ae56f011049ee6355a4310c3ddc52..bd8342fe03ba873a93dc4ad9ed6956675ff04022 100644 (file)
--- a/Recycler/NGObjDOM/XHTML.subproj/GNUmakefile.preamble
+++ b/Recycler/NGObjDOM/XHTML.subproj/GNUmakefile.preamble
@@ -1,4 +1,4 @@
-# $Id$
+# compilation settings
 
 ADDITIONAL_CPPFLAGS += -pipe -Wall
 
@@ -32,8 +32,13 @@ ADDITIONAL_LIB_DIRS +=                               \
         -L../../NGScripting/$(GNUSTEP_OBJ_DIR)
 endif
 
+#XHTML_BUNDLE_LIBS += \
+#        -lNGScripting
+
 XHTML_BUNDLE_LIBS += \
-        -lNGObjDOM -lNGObjWeb -lNGScripting     \
+        -lNGObjDOM -lNGObjWeb           \
        -lNGMime -lNGStreams            \
        -lEOControl -lNGExtensions      \
         -lXmlRpc -lDOM -lSaxObjC
+
+SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib

diff --git a/Recycler/NGObjDOM/XUL.subproj/GNUmakefile b/Recycler/NGObjDOM/XUL.subproj/GNUmakefile
index 5020f5117576007a37d86046fa0185a483e306ba..4730cc0c66f19b3992a4be8d88f9187ef16a8918 100644 (file)
--- a/Recycler/NGObjDOM/XUL.subproj/GNUmakefile
+++ b/Recycler/NGObjDOM/XUL.subproj/GNUmakefile
@@ -1,6 +1,9 @@
-# $Id$
+# GNUstep makefile
 
+-include ../../../config.make
 include $(GNUSTEP_MAKEFILES)/common.make
+-include ../../../Version
+include ../Version
 
 BUNDLE_NAME        = XUL
 BUNDLE_EXTENSION   = .odr

diff --git a/Recycler/NGObjDOM/fhs.make b/Recycler/NGObjDOM/fhs.make
new file mode 100644 (file)
index 0000000..8e576cd
--- /dev/null
+++ b/Recycler/NGObjDOM/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