Changeset 49ea49 in git for omalloc/Makefile.am

Timestamp:

Nov 14, 2011, 9:58:53 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

8babe7f5911040e9a652f83ae402f78b91d5c3ed

Parents:

3826d071b0fe1a52a0fa5cdc532b9c99960c5018

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-11-14 21:58:53+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-11-15 11:57:52+01:00

Message:

CHG: eliminated omalloc/omlimits.h.in->.h in favour of static mylimits.h (limits.h)
CHG: generate and use omalloc/omConfig.h (in favour of omConfig.h.in + config.h)

File:

• omalloc/Makefile.am (modified) (5 diffs)

omalloc/Makefile.am

@@ -14 +14 @@
 omBinPage.h             omAllocSystem.h         omTables.h              \
 omAllocPrivate.h        omDebug.h               omInline.h              \
-omAllocFunc.h           omlimits.h              mylimits.h
+omAllocFunc.h           mylimits.h
 
 noinst_HEADERS= omPage.h omDefaultConfig.h omReturn.h omGetPageSize.h \
@@ -33 +33 @@
 libomalloc_g_a_SOURCES=$(SOURCES) $(noinst_HEADERS)
 
-nodist_libomalloc_a_SOURCES = omConfig.h omlimits.h mylimits.h omalloc.h omTables.inc
-nodist_libomalloc_g_a_SOURCES = omConfig.h omlimits.h omalloc.h omTables.inc
+nodist_libomalloc_a_SOURCES = omConfig.h mylimits.h omalloc.h omTables.inc
+nodist_libomalloc_g_a_SOURCES = omConfig.h omalloc.h omTables.inc
 
-libomalloc_a_CPPFLAGS= -DOM_NDEBUG
+libomalloc_a_CPPFLAGS= -DHAVE_CONFIG_H -DOM_NDEBUG
+libomalloc_g_a_CPPFLAGS= -DHAVE_CONFIG_H
 
 BUILT_SOURCES = omTables.inc omTables.h
@@ -47 +48 @@
 
 noinst_PROGRAMS = omTables
-omTables_SOURCES = omAllocPrivate.h omConfig.h omTables.c omlimits.h mylimits.h
-omTables_CPPFLAGS = -DOM_GENERATE_INC
+omTables_SOURCES = omAllocPrivate.h omConfig.h omTables.c mylimits.h
+omTables_CPPFLAGS = -DOM_GENERATE_INC  -DHAVE_CONFIG_H
 
 CLEANFILES = $(BUILT_SOURCES)
@@ -63 +64 @@
 
 omtTest_g_SOURCES = $(OMTTESTSSOURCES)
+omtTest_g_CPPFLAGS = -DHAVE_CONFIG_H
 omtTest_g_CFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long
 omtTest_g_LDADD = -lomalloc_g
@@ -68 +70 @@
 omtTest_m: libomalloc_g.a
 
-omtTest_m_CPPFLAGS = -DOM_TEST_MALLOC
+omtTest_m_CPPFLAGS = -DOM_TEST_MALLOC  -DHAVE_CONFIG_H
 omtTest_m_SOURCES  = $(OMTTESTSSOURCES)
 omtTest_m_LDADD = -lomalloc_g