From: helge Date: Wed, 23 Mar 2005 14:19:12 +0000 (+0000) Subject: fixed NGObjDOM compilation against SOPE HEAD X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b582be86cc41f99d7136a1d988eaee7008cb62d9;p=sope 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 1d96ab36..09de1048 100644 --- a/Recycler/NGObjDOM/ChangeLog +++ b/Recycler/NGObjDOM/ChangeLog @@ -1,3 +1,7 @@ +2005-03-23 Helge Hess + + * added FHS and config.make support, fixed compilation (v4.5.26) + 2004-08-20 Helge Hess * deprecated and moved to Recycler diff --git a/Recycler/NGObjDOM/Dynamic.subproj/GNUmakefile b/Recycler/NGObjDOM/Dynamic.subproj/GNUmakefile index 96988713..2c6e9b5b 100644 --- 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 85fa5e6e..e70ce5b2 100644 --- 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 6b78d181..8a7a50bd 100644 --- 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 ff5cc35f..ab026c50 100644 --- 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 00692826..12e740b6 100644 --- 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 7bca8edf..bd8342fe 100644 --- 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 5020f511..4730cc0c 100644 --- 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 index 00000000..8e576cd0 --- /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