fixed makefiles

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

diff --git a/sope-ical/samples/ChangeLog b/sope-ical/samples/ChangeLog
index 63627214f94ce755c99d8058e79a1bef27616ac2..5281722d9e6f52b8b3cb0dc32a337e04165c2047 100644 (file)
--- a/sope-ical/samples/ChangeLog
+++ b/sope-ical/samples/ChangeLog
@@ -1,3 +1,7 @@
+2004-09-26  Helge Hess  <helge.hess@opengroupware.org>
+
+       * GNUmakefile.preamble: fixed makefiles for SOPE inline compilation
+
 2004-08-29  Helge Hess  <helge.hess@opengroupware.org>
 
        * added hack to install the tools in FHS locations - the executables

diff --git a/sope-ical/samples/GNUmakefile.preamble b/sope-ical/samples/GNUmakefile.preamble
index c6ea250e4b77d22699f6688c69fb1769d46ba8a5..1619772eecbcfee8d159015340005192e26aeb6d 100644 (file)
--- a/sope-ical/samples/GNUmakefile.preamble
+++ b/sope-ical/samples/GNUmakefile.preamble
@@ -1,21 +1,23 @@
-# $Id: GNUmakefile.preamble 9 2004-08-20 18:40:42Z helge $
+# compilation flags
+
+SOPE_CORE="../../sope-core"
+SOPE_XML="../../sope-xml"
 
 ADDITIONAL_INCLUDE_DIRS += \
        -I..                    \
-       -I../NGStreams          \
-       -I../NGExtensions       \
+       -I$(SOPE_CORE)/NGStreams        \
+       -I$(SOPE_CORE)/NGExtensions     \
 
 ADDITIONAL_LIB_DIRS += \
-       -L../../sope-core/EOControl/$(GNUSTEP_OBJ_DIR)    \
-       -L../../sope-core/NGExtensions/$(GNUSTEP_OBJ_DIR) \
-       -L../../sope-core/NGStreams/$(GNUSTEP_OBJ_DIR)    \
-       -L../../sope-xml/DOM/$(GNUSTEP_OBJ_DIR)           \
-       -L../../sope-xml/SaxObjC/$(GNUSTEP_OBJ_DIR)       \
-       -L../NGiCal/$(GNUSTEP_OBJ_DIR)                    \
+       -L../NGiCal/$(GNUSTEP_OBJ_DIR)                  \
+       -L$(SOPE_CORE)/EOControl/$(GNUSTEP_OBJ_DIR)     \
+       -L$(SOPE_CORE)/NGExtensions/$(GNUSTEP_OBJ_DIR)  \
+       -L$(SOPE_CORE)/NGStreams/$(GNUSTEP_OBJ_DIR)     \
+       -L$(SOPE_XML)/DOM/$(GNUSTEP_OBJ_DIR)            \
+       -L$(SOPE_XML)/SaxObjC/$(GNUSTEP_OBJ_DIR)        \
        -L/usr/local/lib -L/usr/lib
 
 
 ADDITIONAL_TOOL_LIBS += \
        -lNGStreams -lNGExtensions -lEOControl  \
        -lDOM -lSaxObjC
-