Changeset b4a676 in git for factory

Timestamp:

Mar 29, 2012, 1:34:51 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

fca452a782a426cceaa9e98f3a95b5a5acccd04f

Parents:

da4e5cb9371055727eda739b44f619c7eabeab5e

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-03-29 13:34:51+02:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-03-29 13:49:42+02:00

Message:

made findexec into a standalone library + removal of resources

add: findexec/configure.ac
del: removed the rests of libpolys/resources & references to it from everywhere
fix: findexec/feResource.cc should better not use S_UNAME
chg: factory should only need findexec & omalloc for testing

Location:

factory

Files:

• Makefile.am (modified) (1 diff)
• configure.ac (modified) (2 diffs)

factory/Makefile.am

@@ -338 +338 @@
 
 # The following ('..') is a hack for a while... 
-TESTADDLIBDIRS = ${OMALLOC_LDFLAGS} -L${builddir}/../findexec -L${builddir}/../libpolys
+TESTADDLIBDIRS = ${OMALLOC_LDFLAGS}
 TESTADDLIB = $(TESTADDLIBDIRS) $(OMALLOC_R_LDADD)
 TESTADDLIBDEBUG = $(TESTADDLIBDIRS) $(OMALLOC_G_LDADD)

factory/configure.ac

@@ -372 +372 @@
   if test "x$with_omalloc_extra_dir" != "x"; then
     OMALLOC_CFLAGS="$OMALLOC_CFLAGS -I${with_omalloc_extra_dir}"
-    OMALLOC_LDFLAGS="$OMALLOC_LDFLAGS -L${with_omalloc_extra_dir}/omalloc -L${with_omalloc_extra_dir}/findexec -L${with_omalloc_extra_dir}/libpolys/resources -L${with_omalloc_extra_dir}/libpolys/reporter -L${with_omalloc_extra_dir}/libpolys/misc"
+    OMALLOC_LDFLAGS="$OMALLOC_LDFLAGS -L${with_omalloc_extra_dir}/omalloc -L${with_omalloc_extra_dir}/findexec"
   fi
   
@@ -385 +385 @@
   CPPFLAGS="$CPPFLAGS_save"
 
-  OMALLOC_G_LDADD="-lresources_g -lreporter_g -lmisc_g -lfindexec_g -lomalloc_g"
-  OMALLOC_R_LDADD="-lresources -lreporter -lmisc -lfindexec -lomalloc"
+  OMALLOC_G_LDADD="-lfindexec_g -lomalloc_g"
+  OMALLOC_R_LDADD="-lfindexec -lomalloc"
   
   AC_DEFINE(HAVE_OMALLOC, 1, [omalloc support])