Author: kraftche Date: 2008-07-03 16:51:09 -0500 (Thu, 03 Jul 2008) New Revision: 1981 Removed: cgm/trunk/itaps/iGeom-Defs.inc.in Modified: cgm/trunk/Makefile.am cgm/trunk/cgm.make.in cgm/trunk/cgm_apps/examples/driverc++/Makefile.am cgm/trunk/cgm_apps/examples/facetdriver/Makefile.am cgm/trunk/configure.in cgm/trunk/geom/ACIS_SRC/Makefile.am cgm/trunk/geom/Cholla/Makefile.am cgm/trunk/geom/Makefile.am cgm/trunk/geom/OCC/Makefile.am cgm/trunk/geom/facet/Makefile.am cgm/trunk/geom/facetbool/Makefile.am cgm/trunk/geom/parallel/Makefile.am cgm/trunk/geom/virtual/Makefile.am cgm/trunk/init/Makefile.am cgm/trunk/itaps/Makefile.am cgm/trunk/itaps/SIDL/Makefile.am cgm/trunk/test/Makefile.am cgm/trunk/util/Makefile.am Log: o Combine all compiled libraries (except SIDL stuff) into a single libcgm.a, and install only that library. o Update all tests to reference libcgm.a. This greatly simplifies build defintions for tests because libcgm automatically pulls in all conditional dependencies (including libcubiti19.so if we're not actually building CGM.) o Greatly simplify makefile stubs by dropping support for using them before installing CGM. Modified: cgm/trunk/Makefile.am =================================================================== --- cgm/trunk/Makefile.am 2008-07-03 19:04:25 UTC (rev 1980) +++ cgm/trunk/Makefile.am 2008-07-03 21:51:09 UTC (rev 1981) @@ -1,5 +1,5 @@ AUTOMAKE_OPTIONS = foreign -SUBDIRS = util geom init itaps test cgm_apps +SUBDIRS = util geom init itaps . test cgm_apps # Automake doesn't seem to have a directory defined for # platform-dependent data (or include) files. So put @@ -8,14 +8,71 @@ cfgdir = $(libdir) cfg_DATA = cgm.make +lib_LTLIBRARIES = libcgm.la + +EXT_LINK_FLAGS = +EXT_LIBTOOL_FLAGS = +EXT_LIBS = +EXT_INCLUDE = +if build_parallel + CGM_ll_LIB = geom/parallel/libcubit_parallel.la +else + CGM_ll_LIB = +endif +if build_ACIS + CGM_ACIS_LIB = $(CGM_ll_LIB) geom/ACIS/libcubit_ACIS.la + EXT_LINK_FLAGS += -L$(ACIS_LIB_DIR) + EXT_LIBTOOL_FLAGS += -R$(ACIS_LIB_DIR) + EXT_LIBS += $(ACIS_LIBS) + EXT_INCLUDE += $(ACIS_INCLUDES) $(ACIS_DEFINES) +else + CGM_ACIS_LIB = +endif +if WITH_OCC + CGM_OCC_LIB = geom/OCC/libcubit_OCC.la + EXT_LINK_FLAGS += -L$(OCC_LIB_DIR) + EXT_LIBTOOL_FLAGS += -R$(OCC_LIB_DIR) + EXT_LIBS += $(OCC_LIBS) + EXT_INCLUDE += $(OCC_INC_FLAG) +else + CGM_OCC_LIB = +endif + +if BUILD_CGM + CORE_CGM_LIBS = $(CGM_ACIS_LIB) \ + $(CGM_OCC_LIB) \ + $(CGM_ll_LIB) \ + geom/virtual/libcubit_virtual.la \ + geom/facet/libcubit_facet.la \ + geom/Cholla/libcholla.la \ + geom/facetbool/libcubit_facetbool.la \ + geom/libcubit_geom.la \ + util/libcubit_util.la +else + CORE_CGM_LIBS = $(CUBIT_LTFLAGS) $(CUBIT_LDFLAGS) $(CUBIT_LIBS) +endif + + + +libcgm_la_LIBADD = init/libcgma_init.la \ + itaps/libiGeom.la \ + $(CORE_CGM_LIBS) \ + $(EXT_LINK_FLAGS) \ + $(EXT_LIBS) + +libcgm_la_SOURCES = + + # By default, cmg.make will define these to $(srcdir). We # want to override that during the INSTALL of the file so # that the correct values are set (e.g. if someone does # 'make prefix=/foo install', we don't know the correct install # directory until we're doing the install. +CFG_FILE = $(DESTDIR)$(cfgdir)/cgm.make install-data-hook: - echo 'CGM_LIBS_LDFLAGS=$$(CGM_LIBS_LDFLAGS_INSTALLED)' >> $(DESTDIR)$(cfgdir)/cgm.make - echo 'CGMA_INIT_LDFLAGS=$$(CGMA_INIT_LDFLAGS_INSTALLED)' >> $(DESTDIR)$(cfgdir)/cgm.make - echo 'CGM_INCLUDES=$$(CGM_INC_CPPFLAGS_INSTALLED)' >> $(DESTDIR)$(cfgdir)/cgm.make - echo "CGM_LIBDIR=${libdir}" >> $(DESTDIR)$(cfgdir)/cgm.make - echo "CGM_INCLUDEDIR=${includedir}" >> $(DESTDIR)$(cfgdir)/cgm.make + echo "CGM_EXT_INCLUDE = $(EXT_INCLUDE)" >> $(CFG_FILE) + echo "CGM_EXT_LIBS = $(EXT_LIBS)" >> $(CFG_FILE) + echo "CGM_EXT_LDFLAGS = $(EXT_LINK_FLAGS)" >> $(CFG_FILE) + echo "CGM_EXT_LTFLAGS = $(EXT_LIBTOOL_FLAGS)" >> $(CFG_FILE) + echo "CGM_LIBDIR = $(libdir)" >> $(CFG_FILE) + echo "CGM_INCLUDEDIR = $(includedir)" >> $(CFG_FILE) Modified: cgm/trunk/cgm.make.in =================================================================== --- cgm/trunk/cgm.make.in 2008-07-03 19:04:25 UTC (rev 1980) +++ cgm/trunk/cgm.make.in 2008-07-03 21:51:09 UTC (rev 1981) @@ -11,124 +11,24 @@ # #================================================================== -CANT_USE_STD = @CANT_USE_STD@ -CANT_USE_STD_IO = @CANT_USE_STD_IO@ -TEMPLATE_DEFS_INCLUDED = @TEMPLATE_DEFS_INCLUDED@ +# The following variables are overridden when this file is installed +CGM_EXT_INCLUDE = +CGM_EXT_LIBS = +CGM_EXT_LDFLAGS = +CGM_EXT_LTFLAGS = +CGM_INCLUDEDIR = . +CGM_LIBDIR = $(abs_buildidr)/.libs -ACIS_DEFS = @ACIS_DEFS@ -ACIS_DIR = @ACIS_DIR@ -ACIS_LIB_DIR = @ACIS_LIB_DIR@ -ACIS_LINK_FLAGS = @ACIS_LINK_FLAGS@ -ACIS_VERSION = @ACIS_VERSION@ -ACIS_HEALER = @ACIS_HEALER@ -ACIS_PLATFORM = @ACIS_PLATFORM@ -ACIS_STEP_TRANSLATOR = @ACIS_STEP_TRANSLATOR@ -ACIS_IGES_TRANSLATOR = @ACIS_IGES_TRANSLATOR@ -ACIS_LIBS = @CGM_ACIS_LIBS@ @ACIS_LIBS@ -ACIS_INCLUDES = @ACIS_INCLUDES@ +# Pre-processor flags +CGM_DEFINES = @CANT_USE_STD@ @CANT_USE_STD_IO@ @TEMPLATE_DEFS_INCLUDED@ +CGM_INCLUDES = $(CGM_EXT_INCLUDE) -I$(CGM_INCLUDEDIR) +CGM_CPPFLAGS = $(CGM_DEFINES) $(CGM_INCLUDES) -OCC_INCLUDES = @OCC_INC_FLAG@ -OCC_LIB_DIR = @OCC_LIB_DIR@ -OCC_LIB_FLAG = @OCC_LIB_FLAG@ -OCC_LIBS = @CUBIT_OCC_LIB@ @OCC_LIBS@ +# Link flags +CGM_LDFLAGS = -L$(CGM_LIBDIR) $(CGM_EXT_LDFLAGS) +CGM_LTFLAGS = -R$(CGM_LIBDIR) $(CGM_EXT_LTFLAGS) +CGM_LIBS = -lcgm $(CGM_EXT_LIBS) +CGM_LIBS_LINK = $(CGM_LDFLAGS) $(CGM_LIBS) -CGM_PARALLEL_INCLUDE = @CGM_PARALLEL_INCLUDE@ -CGM_PARALLEL_LIB = @CGM_PARALLEL_LIB@ -CGM_PARALLEL_LIB_FILE = @CGM_PARALLEL_LIB_FILE@ -# These get redefined by a makefile target during *install* -# by appending correct values to the end of the file. -CGM_LIBDIR = @abs_builddir@ -CGM_INCLUDEDIR = @abs_srcdir@ +# Build-generated values appended after this line -CGM_CXX = @CXX@ -CGM_CC = @CC@ -CGM_CPPFLAGS = @CUBIT_CGM@ @CANT_USE_STD@ @CANT_USE_STD_IO@ @TEMPLATE_DEFS_INCLUDED@ ${ACIS_DEFS} -CGM_CXXFLAGS = @CXXFLAGS@ -CGM_CFLAGS = @CFLAGS@ -CGM_LDFLAGS = @LDFLAGS@ - -CGM_INC_CPPFLAGS_COMMON = ${ACIS_INCLUDES} ${OCC_INCLUDES} -CGM_INC_CPPFLAGS_UNINSTALLED = \ - -I@abs_srcdir@/util \ - -I@abs_builddir@/util \ - -I@abs_srcdir@/init \ - -I@abs_srcdir@/geom \ - -I@abs_builddir@/geom \ - -I@abs_srcdir@/itaps \ - -I@abs_builddir@/itaps \ - -I@abs_srcdir@/geom/ACIS \ - -I@abs_srcdir@/geom/OCC \ - $(CGM_PARALLEL_INCLUDE) \ - $(CGM_INC_CPPFLAGS_COMMON) -CGM_INC_CPPFLAGS_INSTALLED = \ - -I$(CGM_INCLUDEDIR) \ - $(CGM_INC_CPPFLAGS_COMMON) - -# will be overriden upon install -CGM_INCLUDES = $(CGM_INC_CPPFLAGS_UNINSTALLED) - -CGM_LIBS_LDFLAGS_COMMON = $(ACIS_LINK_FLAGS) $(OCC_LIB_FLAG) - -CGM_LIBS_LDFLAGS_UNINSTALLED = \ - -L@abs_builddir@/geom/virtual/.libs \ - -L@abs_builddir@/geom/facetbool/.libs \ - -L@abs_builddir@/geom/facet/.libs \ - -L@abs_builddir@/geom/Cholla/.libs \ - -L@abs_builddir@/geom/ACIS/.libs \ - -L@abs_builddir@/geom/OCC/.libs \ - -L@abs_builddir@/geom/.libs \ - -L@abs_builddir@/util/.libs \ - -L@abs_builddir@/geom/virtual \ - -L@abs_builddir@/geom/facetbool \ - -L@abs_builddir@/geom/facet \ - -L@abs_builddir@/geom/Cholla \ - -L@abs_builddir@/geom/ACIS \ - -L@abs_builddir@/geom \ - -L@abs_builddir@/util \ - $(CGM_LIBS_LDFLAGS_COMMON) - -CGM_LIBS_LDFLAGS_INSTALLED = -L$(CGM_LIBDIR) $(CGM_LIBS_LDFLAGS_COMMON) - -CGM_LIBS_LIBRARIES = \ - ${ACIS_LIBS} \ - -lcubit_virtual \ - -lcubit_facet \ - -lcubit_facetbool \ - -lcholla \ - ${ACIS_LIBS} \ - -lcubit_geom \ - -lcubit_util \ - ${CGM_PARALLEL_LIB} \ - ${OCC_LIBS} - -# Will be overridden upon install -CGM_LIBS_LDFLAGS = $(CGM_LIBS_LDFLAGS_UNINSTALLED) - -CGM_LIBS_LINK_INTERNAL = $(LDFLAGS) $(CGM_LIBS_LDFLAGS) $(CGM_LIBS_LIBRARIES) - -CGMA_INIT_LDFLAGS_UNINSTALLED = -L@abs_builddir@/init -L@abs_builddir@/init/.libs -CGMA_INIT_LDFLAGS_INSTALLED = -L$(CGM_LIBDIR) - -# Will be overridden upon install -CGMA_INIT_LDFLAGS = $(CGMA_INIT_LDFLAGS_UNINSTALLED) - -CGM_LIBS_FILES_INTERNAL = \ - $(CGM_LIBDIR)/libcgma_init.la \ - $(CGM_LIBDIR)/libcubit_virtual.la \ - $(CGM_LIBDIR)/libcubit_facetbool.la \ - $(CGM_LIBDIR)/libcubit_facet.la \ - $(CGM_LIBDIR)/libcholla.la \ - $(CGM_LIBDIR)/libcubit_geom.la \ - $(CGM_LIBDIR)/libcubit_util.la \ - ${CGM_PARALLEL_LIB_FILE} - -CUBIT_LTFLAGS = @CUBIT_LTFLAGS@ -CUBIT_LDFLAGS = @CUBIT_LDFLAGS@ -CUBIT_LIBS = @CUBIT_LIBS@ -CUBIT_FILE = @CUBIT_FILE@ - -# CGM_LIBS_LINK is set by configure script to be either -# "$(CUBIT_LDFLAGS) $(CUBIT_LIBS)" or "$(CGM_LIBS_LINK_INTERNAL)" -CGM_LIBS_LINK = $(CGMA_INIT_LDFLAGS) -lcgma_init @CGM_LIBS_LINK@ -CGM_LIBS_FILES = @CGM_LIBS_FILES@ -CGM_LIBS_LTFLAGS = @CGM_LIBS_LTFLAGS@ Modified: cgm/trunk/cgm_apps/examples/driverc++/Makefile.am =================================================================== --- cgm/trunk/cgm_apps/examples/driverc++/Makefile.am 2008-07-03 19:04:25 UTC (rev 1980) +++ cgm/trunk/cgm_apps/examples/driverc++/Makefile.am 2008-07-03 21:51:09 UTC (rev 1981) @@ -11,6 +11,5 @@ mergechk_SOURCES = mergechk.cpp -LDADD = ../../../geom/libcubit_geom.la \ - ../../../geom/ACIS/libcubit_ACIS.la +LDADD = ../../../libcgm.la Modified: cgm/trunk/cgm_apps/examples/facetdriver/Makefile.am =================================================================== --- cgm/trunk/cgm_apps/examples/facetdriver/Makefile.am 2008-07-03 19:04:25 UTC (rev 1980) +++ cgm/trunk/cgm_apps/examples/facetdriver/Makefile.am 2008-07-03 21:51:09 UTC (rev 1981) @@ -10,5 +10,4 @@ -I$(top_srcdir)/geom/Cholla \ -I$(top_srcdir)/geom/facet -LDADD = ../../../geom/libcubit_geom.la \ - ../../../geom/facet/libcubit_facet.la +LDADD = ../../../libcgm.la Modified: cgm/trunk/configure.in =================================================================== --- cgm/trunk/configure.in 2008-07-03 19:04:25 UTC (rev 1980) +++ cgm/trunk/configure.in 2008-07-03 21:51:09 UTC (rev 1981) @@ -337,9 +337,7 @@ init/Makefile cgm.make itaps/Makefile - itaps/iGeom-Defs.inc itaps/SIDL/Makefile - itaps/SIDL/iGeom-SIDL-Defs.inc test/Makefile cgm_apps/Makefile cgm_apps/examples/Makefile Modified: cgm/trunk/geom/ACIS_SRC/Makefile.am =================================================================== --- cgm/trunk/geom/ACIS_SRC/Makefile.am 2008-07-03 19:04:25 UTC (rev 1980) +++ cgm/trunk/geom/ACIS_SRC/Makefile.am 2008-07-03 21:51:09 UTC (rev 1981) @@ -12,7 +12,7 @@ -I$(ACIS_DIR)/include # The name of the library to build -lib_LTLIBRARIES = libcubit_ACIS.la +noinst_LTLIBRARIES = libcubit_ACIS.la # The directory where headers will be installed libcubit_ACIS_la_includedir = $(includedir) @@ -80,6 +80,5 @@ gtcAttrib/incl/attrib_name.h \ gtcAttrib/incl/gtcAttrib_exConst.h -libcubit_ACIS_la_LIBADD = -L$(ACIS_LIB_DIR) $(ACIS_LIBS) \ - ../libcubit_geom.la +libcubit_ACIS_la_LIBADD = -L$(ACIS_LIB_DIR) $(ACIS_LIBS) Modified: cgm/trunk/geom/Cholla/Makefile.am =================================================================== --- cgm/trunk/geom/Cholla/Makefile.am 2008-07-03 19:04:25 UTC (rev 1980) +++ cgm/trunk/geom/Cholla/Makefile.am 2008-07-03 21:51:09 UTC (rev 1981) @@ -6,13 +6,11 @@ INCLUDES = -I$(top_srcdir)/util -I$(top_srcdir)/geom # The name of the library to build -lib_LTLIBRARIES = +noinst_LTLIBRARIES = if BUILD_CGM - lib_LTLIBRARIES += libcholla.la + noinst_LTLIBRARIES += libcholla.la endif -libcholla_la_LIBADD = ../libcubit_geom.la - # The directory where headers will be installed libcholla_la_includedir = $(includedir) Modified: cgm/trunk/geom/Makefile.am =================================================================== --- cgm/trunk/geom/Makefile.am 2008-07-03 19:04:25 UTC (rev 1980) +++ cgm/trunk/geom/Makefile.am 2008-07-03 21:51:09 UTC (rev 1981) @@ -20,13 +20,11 @@ INCLUDES = -I$(top_srcdir)/util -I. # The name of the library to build -lib_LTLIBRARIES = +noinst_LTLIBRARIES = if BUILD_CGM - lib_LTLIBRARIES += libcubit_geom.la + noinst_LTLIBRARIES += libcubit_geom.la endif -libcubit_geom_la_LIBADD = ../util/libcubit_util.la - # The directory where headers will be installed libcubit_geom_la_includedir = $(includedir) Modified: cgm/trunk/geom/OCC/Makefile.am =================================================================== --- cgm/trunk/geom/OCC/Makefile.am 2008-07-03 19:04:25 UTC (rev 1980) +++ cgm/trunk/geom/OCC/Makefile.am 2008-07-03 21:51:09 UTC (rev 1981) @@ -11,19 +11,10 @@ $(OCC_INC_FLAG) # The name of the library to build -OCC_TARGET= -if WITH_OCC - OCC_TARGET += libcubit_OCC.la -endif +noinst_LTLIBRARIES = libcubit_OCC.la -lib_LTLIBRARIES = -if BUILD_CGM - lib_LTLIBRARIES += $(OCC_TARGET) -endif +libcubit_OCC_la_LIBADD = -L$(OCC_LIB_DIR) $(OCC_LIBS) -libcubit_OCC_la_LIBADD = $(OCC_LIB_FLAG) $(OCC_LIBS) \ - ../libcubit_geom.la - # The directory where headers will be installed libcubit_OCC_la_includedir = $(includedir) Modified: cgm/trunk/geom/facet/Makefile.am =================================================================== --- cgm/trunk/geom/facet/Makefile.am 2008-07-03 19:04:25 UTC (rev 1980) +++ cgm/trunk/geom/facet/Makefile.am 2008-07-03 21:51:09 UTC (rev 1981) @@ -9,15 +9,11 @@ -I$(top_srcdir)/geom/facetbool # The name of the library to build -lib_LTLIBRARIES = +noinst_LTLIBRARIES = if BUILD_CGM - lib_LTLIBRARIES += libcubit_facet.la + noinst_LTLIBRARIES += libcubit_facet.la endif -libcubit_facet_la_LIBADD = ../libcubit_geom.la \ - ../facetbool/libcubit_facetbool.la \ - ../Cholla/libcholla.la - # The directory where headers will be installed libcubit_facet_la_includedir = $(includedir) Modified: cgm/trunk/geom/facetbool/Makefile.am =================================================================== --- cgm/trunk/geom/facetbool/Makefile.am 2008-07-03 19:04:25 UTC (rev 1980) +++ cgm/trunk/geom/facetbool/Makefile.am 2008-07-03 21:51:09 UTC (rev 1981) @@ -7,13 +7,11 @@ -I$(top_srcdir)/geom # The name of the library to build -lib_LTLIBRARIES = +noinst_LTLIBRARIES = if BUILD_CGM - lib_LTLIBRARIES += libcubit_facetbool.la + noinst_LTLIBRARIES += libcubit_facetbool.la endif -libcubit_facetbool_la_LIBADD= ../libcubit_geom.la - # The directory where headers will be installed libcubit_facetbool_la_includedir = $(includedir) Modified: cgm/trunk/geom/parallel/Makefile.am =================================================================== --- cgm/trunk/geom/parallel/Makefile.am 2008-07-03 19:04:25 UTC (rev 1980) +++ cgm/trunk/geom/parallel/Makefile.am 2008-07-03 21:51:09 UTC (rev 1981) @@ -15,13 +15,11 @@ $(MPI_INCLUDE) # The name of the library to build -lib_LTLIBRARIES = +noinst_LTLIBRARIES = if BUILD_CGM - lib_LTLIBRARIES += libcubit_parallel.la + noinst_LTLIBRARIES += libcubit_parallel.la endif -libcubit_parallel_la_LIBADD = ../libcubit_geom.la ../ACIS/libcubit_ACIS.la - # The directory where headers will be installed libcubit_parallel_la_includedir = $(includedir) Modified: cgm/trunk/geom/virtual/Makefile.am =================================================================== --- cgm/trunk/geom/virtual/Makefile.am 2008-07-03 19:04:25 UTC (rev 1980) +++ cgm/trunk/geom/virtual/Makefile.am 2008-07-03 21:51:09 UTC (rev 1981) @@ -9,13 +9,11 @@ -I$(top_srcdir)/geom/Cholla # The name of the library to build -lib_LTLIBRARIES = +noinst_LTLIBRARIES = if BUILD_CGM - lib_LTLIBRARIES += libcubit_virtual.la + noinst_LTLIBRARIES += libcubit_virtual.la endif -libcubit_virtual_la_LIBADD = ../libcubit_geom.la - # The directory where headers will be installed libcubit_virtual_la_includedir = $(includedir) Modified: cgm/trunk/init/Makefile.am =================================================================== --- cgm/trunk/init/Makefile.am 2008-07-03 19:04:25 UTC (rev 1980) +++ cgm/trunk/init/Makefile.am 2008-07-03 21:51:09 UTC (rev 1981) @@ -12,7 +12,7 @@ -I$(top_srcdir)/geom/cholla \ -I$(srcdir) -lib_LTLIBRARIES = libcgma_init.la +noinst_LTLIBRARIES = libcgma_init.la libcgma_init_la_includedir = $(includedir) libcgma_init_la_SOURCES = InitCGMA.cpp libcgma_init_la_include_HEADERS = InitCGMA.hpp Modified: cgm/trunk/itaps/Makefile.am =================================================================== --- cgm/trunk/itaps/Makefile.am 2008-07-03 19:04:25 UTC (rev 1980) +++ cgm/trunk/itaps/Makefile.am 2008-07-03 21:51:09 UTC (rev 1981) @@ -10,42 +10,22 @@ SUBDIRS = . $(SIDL_DIR) -lib_LTLIBRARIES = libiGeom.la +noinst_LTLIBRARIES = libiGeom.la if build_ACIS - TEST_ACISLIBS = $(top_builddir)/geom/ACIS/libcubit_ACIS.la TEST_ACISPATH = -R$(ACIS_LIB_DIR) else - TEST_ACISLIBS = TEST_ACISPATH = endif -if BUILD_CGM - TEST_XLIBS = $(TEST_ACISLIBS) \ - $(top_builddir)/geom/facet/libcubit_facet.la \ - $(top_builddir)/geom/facetbool/libcubit_facetbool.la \ - $(top_builddir)/geom/Cholla/libcholla.la \ - $(top_builddir)/geom/virtual/libcubit_virtual.la \ - $(top_builddir)/geom/libcubit_geom.la \ - $(top_builddir)/util/libcubit_util.la -else - TEST_XLDFLAGS = $(CUBIT_LDFLAGS) $(CUBIT_LTFLAGS) - TEST_XLIBS = $(CUBIT_LIBS) -endif - -if build_ACIS - ACIS_CGM_INCLUDES = -I$(top_srcdir)/geom/ACIS -else - ACIS_CGM_INCLUDES = -endif - libiGeom_la_includedir = $(includedir) -libiGeom_la_libadd = $(top_builddir)/init/libcgma_init.la $(TEST_XLIBS) +libiGeom_la_libadd = $(top_builddir)/libcgm.la INCLUDES = -I$(top_srcdir)/util \ -I$(top_srcdir)/geom \ -I$(top_srcdir)/init \ + -I$(top_srcdir)/geom/ACIS \ -I. libiGeom_la_SOURCES = \ @@ -67,7 +47,7 @@ check_PROGRAMS = $(TESTS) testgeom_SOURCES = testgeom.cc -testgeom_LDADD = $(TEST_XLDFLAGS) libiGeom.la ../init/libcgma_init.la $(TEST_XLIBS) +testgeom_LDADD = ../libcgm.la testgeom_CPPFLAGS = $(CPPFLAGS) -DSRCDIR=$(srcdir) testgeom_LDFLAGS = $(TEST_ACISPATH) @@ -83,11 +63,12 @@ # that the correct values are set (e.g. if someone does # 'make prefix=/foo install', we don't know the correct install # directory until we're doing the install. -install-data-hook: - echo "iGeom_SRCDIR=${includedir}" >> $(DESTDIR)$(cfgdir)/iGeom-Defs.inc - echo "iGeom_BLDDIR=${includedir}" >> $(DESTDIR)$(cfgdir)/iGeom-Defs.inc - echo "iGeom_DIR=${cfgdir}" >> $(DESTDIR)$(cfgdir)/iGeom-Defs.inc - echo "iGeom_LIBDIR=${libdir}" >> $(DESTDIR)$(cfgdir)/iGeom-Defs.inc - echo "CGM_LDFLAGS=-L${libdir}" >> $(DESTDIR)$(cfgdir)/iGeom-Defs.inc - echo "CGM_INCLUDEDIR=${includedir}" >> $(DESTDIR)$(cfgdir)/iGeom-Defs.inc +iGeom-Defs.inc: Makefile.am + @echo "include $(cfgdir)/cgm.make" > $@ + @echo 'iGeom_LDFLAGS = $$(CGM_LDFLAGS)' >> $@ + @echo 'iGeom_LTFLAGS = $$(CGM_LTFLAGS)' >> $@ + @echo 'iGeom_LIBS = $$(CGM_LIBS)' >> $@ + @echo 'iGeom_DEFINES = $$(CGM_DEFINES)' >> $@ + @echo 'iGeom_INCLUDES = $$(CGM_INCLUDES)' >> $@ + @echo 'iGeom_CPPFLAGS = $$(CGM_CPPFLAGS)' >> $@ Modified: cgm/trunk/itaps/SIDL/Makefile.am =================================================================== --- cgm/trunk/itaps/SIDL/Makefile.am 2008-07-03 19:04:25 UTC (rev 1980) +++ cgm/trunk/itaps/SIDL/Makefile.am 2008-07-03 21:51:09 UTC (rev 1981) @@ -143,10 +143,11 @@ # that the correct values are set (e.g. if someone does # 'make prefix=/foo install', we don't know the correct install # directory until we're doing the install. -install-data-hook: - echo "iGeom_DIR=${cfgdir}" >> $(DESTDIR)$(cfgdir)/iGeom-SIDL-Defs.inc - echo "iGeom_SIDLLIBDIR=${libdir}" >> $(DESTDIR)$(cfgdir)/iGeom-SIDL-Defs.inc - echo "iGeom_SIDLINCLUDEDIR=${includedir}/SIDL" >> $(DESTDIR)$(cfgdir)/iGeom-SIDL-Defs.inc - (cd gserver; install -d ${includedir}/SIDL; install -t ${includedir}/SIDL ${SERVER_HDRS}) - -#include make.dependencies +iGeom-SIDL-Defs.inc: + @echo "include $(cfgdir)/iGeom-SIDL-Defs.inc" > $@ + @echo 'iGeom_SIDL_INCLUDES = $$(iGeom_INCLUDES) -I$(BABEL_DIR)/include' >> $@ + @echo 'iGeom_SIDL_CPPFLAGS = $$(iGeom_CPPFLAGS) -I$(BABEL_DIR)/include' >> $@ + @echo 'iGeom_SIDL_DEFINES = $$(iGeom_DEFINES)' >> $@ + @echo 'iGeom_SIDL_LDFLAGS = $$(iGeom_LDFLAGS) -L$(BABEL_DIR)/lib' >> $@ + @echo 'iGeom_SIDL_LTFLAGS = $$(iGeom_LDFLAGS) -R$(BABEL_DIR)/lib' >> $@ + @echo 'iGeom_SIDL_LIBS = $$(iGeom_LIBS) -lsidl -liGeomserver' >> $@ Deleted: cgm/trunk/itaps/iGeom-Defs.inc.in =================================================================== --- cgm/trunk/itaps/iGeom-Defs.inc.in 2008-07-03 19:04:25 UTC (rev 1980) +++ cgm/trunk/itaps/iGeom-Defs.inc.in 2008-07-03 21:51:09 UTC (rev 1981) @@ -1,48 +0,0 @@ -ACIS_LIB_DIR = @ACIS_LIB_DIR@ -ACIS_LIBS = @CGM_ACIS_LIBS@ @ACIS_LIBS@ -ACIS_LINK_FLAGS = @ACIS_LINK_FLAGS@ - -CGM_PARALLEL_LIB = @CGM_PARALLEL_LIB@ - -CGM_LIBS_LINK_INTERNAL = \ - $(CGM_LDFLAGS) \ - ${ACIS_LINK_FLAGS} \ - ${ACIS_LIBS} -lcubit_virtual -lcubit_facet -lcubit_facetbool -lcholla ${ACIS_LIBS} -lcubit_geom -lcubit_util \ - ${CGM_PARALLEL_LIB} - -CUBIT_LTFLAGS = @CUBIT_LTFLAGS@ -CUBIT_LDFLAGS = @CUBIT_LDFLAGS@ -CUBIT_LIBS = @CUBIT_LIBS@ -CUBIT_LINK = $(CUBIT_LDFLAGS) $(CUBIT_LIBS) -CUBIT_FILE = @CUBIT_FILE@ - -CGM_LIBS_LINK = @CGM_LIBS_LINK@ -CGM_LIBS_FILES = @CGM_LIBS_FILES@ -CGM_LIBS_LTFLAGS = @CGM_LIBS_LTFLAGS@ - -iGeom_INCLUDES = -I$(iGeom_SRCDIR) -I$(iGeom_BLDDIR) - -iGeom_LIBS = $(iGeom_LDFLAGS) \ - -L${iGeom_LIBDIR} -liGeom \ - $(CGM_LIBS_LINK) - -# These get redefined by a makefile target during *install* -# by appending correct values to the end of the file. -iGeom_SRCDIR = @abs_srcdir@ -iGeom_BLDDIR = @abs_builddir@ -iGeom_DIR = @abs_builddir@ -iGeom_LIBDIR = @abs_builddir@/.libs -CGM_LDFLAGS = -L$(abs_topbuilddir)/geom/virtual/.libs \ - -L$(abs_topbuilddir)/geom/virtual \ - -L$(abs_topbuilddir)/geom/facetbool/.libs \ - -L$(abs_topbuilddir)/geom/facetbool \ - -L$(abs_topbuilddir)/geom/facet/.libs \ - -L$(abs_topbuilddir)/geom/facet \ - -L$(abs_topbuilddir)/geom/Cholla/.libs \ - -L$(abs_topbuilddir)/geom/Cholla \ - -L$(abs_topbuilddir)/geom/ACIS/.libs \ - -L$(abs_topbuilddir)/geom/ACIS \ - -L$(abs_topbuilddir)/geom/.libs \ - -L$(abs_topbuilddir)/geom \ - -L$(abs_topbuilddir)/util/.libs \ - -L$(abs_topbuilddir)/util \ Modified: cgm/trunk/test/Makefile.am =================================================================== --- cgm/trunk/test/Makefile.am 2008-07-03 19:04:25 UTC (rev 1980) +++ cgm/trunk/test/Makefile.am 2008-07-03 21:51:09 UTC (rev 1981) @@ -11,17 +11,14 @@ -I$(srcdir) \ $(OCC_INC_FLAG) -ENGINE_LIBS = LINK_FLAGS = TESTS = sheet if build_ACIS TESTS += webcut - ENGINE_LIBS += ../geom/ACIS/libcubit_ACIS.la LINK_FLAGS += -R$(ACIS_LIB_DIR) endif if WITH_OCC TESTS += modify makept - ENGINE_LIBS += ../geom/OCC/libcubit_OCC.la LINK_FLAGS += -R$(OCC_LIB_DIR) endif @@ -33,17 +30,12 @@ makept_SOURCES = makept.cpp modify_SOURCES = modify.cpp sheet_SOURCES = sheet.cpp -LDADD = ../geom/virtual/libcubit_virtual.la \ - ../geom/facetbool/libcubit_facetbool.la \ - ../geom/Cholla/libcholla.la \ - ../geom/facet/libcubit_facet.la \ - ../geom/libcubit_geom.la \ - ../util/libcubit_util.la -webcut_LDFLAGS = $(LDFLAGS) -R$(ACIS_LIB_DIR) +LDADD = ../libcgm.la +webcut_LDFLAGS = $(LDFLAGS) $(LINK_FLAGS) webcut_LDADD = ../geom/ACIS/libcubit_ACIS.la $(LDADD) -makept_LDFLAGS = $(LDFLAGS) -R$(OCC_LIB_DIR) +makept_LDFLAGS = $(LDFLAGS) $(LINK_FLAGS) makept_LDADD = ../geom/OCC/libcubit_OCC.la $(LDADD) -modify_LDFLAGS = $(LDFLAGS) -R$(OCC_LIB_DIR) +modify_LDFLAGS = $(LDFLAGS) $(LINK_FLAGS) modify_LDADD = ../geom/OCC/libcubit_OCC.la $(LDADD) sheet_LDFLAGS = $(LDFLAGS) $(LINK_FLAGS) -sheet_LDADD = $(ENGINE_LIBS) $(LDADD) +sheet_LDADD = $(LDADD) Modified: cgm/trunk/util/Makefile.am =================================================================== --- cgm/trunk/util/Makefile.am 2008-07-03 19:04:25 UTC (rev 1980) +++ cgm/trunk/util/Makefile.am 2008-07-03 21:51:09 UTC (rev 1981) @@ -5,9 +5,9 @@ DEFS = $(TEMPLATE_DEFS_INCLUDED) $(LITTLE_ENDIAN) # The name of the library to build -lib_LTLIBRARIES = +noinst_LTLIBRARIES = if BUILD_CGM - lib_LTLIBRARIES += libcubit_util.la + noinst_LTLIBRARIES += libcubit_util.la endif # The directory where headers will be installed