mirror of
git://git.code.sf.net/p/cdesktopenv/code
synced 2025-03-09 15:50:02 +00:00
dtinfo/dtinfo/src: more changes to the way the libs are made
This commit is contained in:
Jon Trulson
parent
12c82495fd
commit
7540b13e2b
19 changed files with 120 additions and 60 deletions
|
|
@ -1,6 +1,6 @@
|
|||
MAINTAINERCLEANFILES = Makefile.in
|
||||
|
||||
noinst_LTLIBRARIES = libAgents.la
|
||||
noinst_LIBRARIES = libAgents.a
|
||||
|
||||
# get our env
|
||||
include ../templates/dtinfo_env.mk
|
||||
|
|
@ -8,8 +8,11 @@ include ../templates/dtinfo_env.mk
|
|||
# class info
|
||||
include Classlist.mk
|
||||
|
||||
libAgents_la_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES)
|
||||
libAgents_la_SOURCES = ../Prelude.h $(Agents_SRCS)
|
||||
libAgents_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES)
|
||||
libAgents_a_SOURCES = ../Prelude.h $(Agents_SRCS)
|
||||
|
||||
RANLIB = echo
|
||||
libAgents_a_AR = $(LD) -r -o
|
||||
|
||||
BUILT_SOURCES = Agents.msg
|
||||
CLEANFILES = $(BUILT_SOURCES)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
MAINTAINERCLEANFILES = Makefile.in
|
||||
|
||||
noinst_LTLIBRARIES = libBasic.la
|
||||
noinst_LIBRARIES = libBasic.a
|
||||
|
||||
# get our env
|
||||
include ../templates/dtinfo_env.mk
|
||||
|
|
@ -8,7 +8,9 @@ include ../templates/dtinfo_env.mk
|
|||
# class info
|
||||
include Classlist.mk
|
||||
|
||||
libBasic_la_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES)
|
||||
libBasic_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES)
|
||||
|
||||
libBasic_la_SOURCES = ../Prelude.h $(Basic_SRCS)
|
||||
libBasic_a_SOURCES = ../Prelude.h $(Basic_SRCS)
|
||||
|
||||
RANLIB = echo
|
||||
libBasic_a_AR = $(LD) -r -o
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
MAINTAINERCLEANFILES = Makefile.in
|
||||
|
||||
noinst_LTLIBRARIES = libGraphics.la
|
||||
noinst_LIBRARIES = libGraphics.a
|
||||
|
||||
# get our env
|
||||
include ../templates/dtinfo_env.mk
|
||||
|
|
@ -8,7 +8,9 @@ include ../templates/dtinfo_env.mk
|
|||
# class info
|
||||
include Classlist.mk
|
||||
|
||||
libGraphics_la_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES)
|
||||
libGraphics_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES)
|
||||
|
||||
libGraphics_la_SOURCES = ../Prelude.h $(Graphics_SRCS)
|
||||
libGraphics_a_SOURCES = ../Prelude.h $(Graphics_SRCS)
|
||||
|
||||
RANLIB = echo
|
||||
libGraphics_a_AR = $(LD) -r -o
|
||||
|
|
|
|||
|
|
@ -53,10 +53,23 @@ dtinfo.msg.updated:
|
|||
|
||||
CLEANFILES += dtinfo.msg.updated dtinfo.cpp
|
||||
|
||||
## dtinfo proper
|
||||
OLIASNORMALLIBS= Agents/libAgents.a Other/libOther.a \
|
||||
Basic/libBasic.a Preferences/libPreferences.a \
|
||||
UAS/libUAS.a Query/libQuery.a Graphics/libGraphics.a \
|
||||
Managers/libManagers.a Support/libSupport.a \
|
||||
Marks/libMarks.a OnlineRender/libOnlineRender.a \
|
||||
OliasSearch/libOliasSearch.a Widgets/libWidgets.a \
|
||||
cgm/libcgm.a
|
||||
|
||||
#DTSEARCHLIBS = -L$(DTSEARCH_LIBDIR) -lDtSearch
|
||||
|
||||
|
||||
|
||||
#bin_PROGRAMS = dtinfo
|
||||
|
||||
#dtinfo_CPPFLAGS = -DEXPAND_TEMPLATES -I..
|
||||
#dtinfo_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES)
|
||||
|
||||
#dtinfo_LDADD = lib
|
||||
#dtinfo_LDADD = $(OLIASNORMALLIBS) $(LIBSEARCH) $(MMDB_LIBS) $(WWL_LIBS) $(DTCLIENTLIBS) -lXmu $(XTOOLLIB)
|
||||
|
||||
#dtinfo_SOURCES = main.C main_c_api.c
|
||||
# dtinfo_SOURCES = main.C Support/InputNotifier.C
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
MAINTAINERCLEANFILES = Makefile.in
|
||||
|
||||
noinst_LTLIBRARIES = libManagers.la
|
||||
noinst_LIBRARIES = libManagers.a
|
||||
|
||||
# get our env
|
||||
include ../templates/dtinfo_env.mk
|
||||
|
|
@ -8,8 +8,11 @@ include ../templates/dtinfo_env.mk
|
|||
# class info
|
||||
include Classlist.mk
|
||||
|
||||
libManagers_la_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES)
|
||||
libManagers_la_SOURCES = ../Prelude.h $(Managers_SRCS)
|
||||
libManagers_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES)
|
||||
libManagers_a_SOURCES = ../Prelude.h $(Managers_SRCS)
|
||||
|
||||
RANLIB = echo
|
||||
libManagers_a_AR = $(LD) -r -o
|
||||
|
||||
BUILT_SOURCES = Managers.msg
|
||||
CLEANFILES = $(BUILT_SOURCES)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
MAINTAINERCLEANFILES = Makefile.in
|
||||
|
||||
noinst_LTLIBRARIES = libMarks.la
|
||||
noinst_LIBRARIES = libMarks.a
|
||||
|
||||
# get our env
|
||||
include ../templates/dtinfo_env.mk
|
||||
|
|
@ -8,7 +8,10 @@ include ../templates/dtinfo_env.mk
|
|||
# class info
|
||||
include Classlist.mk
|
||||
|
||||
libMarks_la_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES)
|
||||
libMarks_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES)
|
||||
|
||||
libMarks_la_SOURCES = ../Prelude.h $(Marks_SRCS)
|
||||
libMarks_a_SOURCES = ../Prelude.h $(Marks_SRCS)
|
||||
|
||||
RANLIB = echo
|
||||
libMarks_a_AR = $(LD) -r -o
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
MAINTAINERCLEANFILES = Makefile.in
|
||||
|
||||
noinst_LTLIBRARIES = libOliasSearch.la
|
||||
noinst_LIBRARIES = libOliasSearch.a
|
||||
|
||||
# get our env
|
||||
include ../templates/dtinfo_env.mk
|
||||
|
|
@ -8,7 +8,9 @@ include ../templates/dtinfo_env.mk
|
|||
# class info
|
||||
include Classlist.mk
|
||||
|
||||
libOliasSearch_la_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES)
|
||||
libOliasSearch_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES)
|
||||
|
||||
libOliasSearch_la_SOURCES = ../Prelude.h $(OliasSearch_SRCS)
|
||||
libOliasSearch_a_SOURCES = ../Prelude.h $(OliasSearch_SRCS)
|
||||
|
||||
RANLIB = echo
|
||||
libOliasSearch_a_AR = $(LD) -r -o
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
MAINTAINERCLEANFILES = Makefile.in
|
||||
|
||||
noinst_LTLIBRARIES = libOnlineRender.la
|
||||
noinst_LIBRARIES = libOnlineRender.a
|
||||
|
||||
# get our env
|
||||
include ../templates/dtinfo_env.mk
|
||||
|
|
@ -8,8 +8,12 @@ include ../templates/dtinfo_env.mk
|
|||
# class info
|
||||
include Classlist.mk
|
||||
|
||||
libOnlineRender_la_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES)
|
||||
libOnlineRender_la_SOURCES = ../Prelude.h $(OnlineRender_SRCS)
|
||||
libOnlineRender_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES)
|
||||
libOnlineRender_a_SOURCES = ../Prelude.h CanvasRenderer.C \
|
||||
FeatureSupport.C FontCache.C SegClientData.C
|
||||
|
||||
RANLIB = echo
|
||||
libOnlineRender_a_AR = $(LD) -r -o
|
||||
|
||||
BUILT_SOURCES = OnlineRender.msg
|
||||
CLEANFILES = $(BUILT_SOURCES)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
MAINTAINERCLEANFILES = Makefile.in
|
||||
|
||||
noinst_LTLIBRARIES = libOther.la
|
||||
noinst_LIBRARIES = libOther.a
|
||||
|
||||
# get our env
|
||||
include ../templates/dtinfo_env.mk
|
||||
|
|
@ -8,8 +8,11 @@ include ../templates/dtinfo_env.mk
|
|||
# class info
|
||||
include Classlist.mk
|
||||
|
||||
libOther_la_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES)
|
||||
libOther_la_SOURCES = ../Prelude.h $(Other_SRCS)
|
||||
libOther_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES)
|
||||
libOther_a_SOURCES = ../Prelude.h $(Other_SRCS)
|
||||
|
||||
RANLIB = echo
|
||||
libOther_a_AR = $(LD) -r -o
|
||||
|
||||
BUILT_SOURCES = Other.msg
|
||||
CLEANFILES = $(BUILT_SOURCES)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
MAINTAINERCLEANFILES = Makefile.in
|
||||
|
||||
noinst_LTLIBRARIES = libPreferences.la
|
||||
noinst_LIBRARIES = libPreferences.a
|
||||
|
||||
# get our env
|
||||
include ../templates/dtinfo_env.mk
|
||||
|
|
@ -8,7 +8,9 @@ include ../templates/dtinfo_env.mk
|
|||
# class info
|
||||
include Classlist.mk
|
||||
|
||||
libPreferences_la_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES)
|
||||
libPreferences_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES)
|
||||
|
||||
libPreferences_la_SOURCES = ../Prelude.h $(Preferences_SRCS)
|
||||
libPreferences_a_SOURCES = ../Prelude.h $(Preferences_SRCS)
|
||||
|
||||
RANLIB = echo
|
||||
libPreferences_a_AR = $(LD) -r -o
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
MAINTAINERCLEANFILES = Makefile.in
|
||||
|
||||
noinst_LTLIBRARIES = libQuery.la
|
||||
noinst_LIBRARIES = libQuery.a
|
||||
|
||||
# get our env
|
||||
include ../templates/dtinfo_env.mk
|
||||
|
|
@ -8,8 +8,11 @@ include ../templates/dtinfo_env.mk
|
|||
# class info
|
||||
include Classlist.mk
|
||||
|
||||
libQuery_la_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES)
|
||||
libQuery_la_SOURCES = ../Prelude.h $(Query_SRCS)
|
||||
libQuery_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES)
|
||||
libQuery_a_SOURCES = ../Prelude.h $(Query_SRCS)
|
||||
|
||||
RANLIB = echo
|
||||
libQuery_a_AR = $(LD) -r -o
|
||||
|
||||
BUILT_SOURCES = Query.msg
|
||||
CLEANFILES = $(BUILT_SOURCES)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
MAINTAINERCLEANFILES = Makefile.in
|
||||
|
||||
noinst_LTLIBRARIES = libSupport.la
|
||||
noinst_LIBRARIES = libSupport.a
|
||||
|
||||
# get our env
|
||||
include ../templates/dtinfo_env.mk
|
||||
|
|
@ -8,7 +8,9 @@ include ../templates/dtinfo_env.mk
|
|||
# class info
|
||||
include Classlist.mk
|
||||
|
||||
libSupport_la_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES)
|
||||
libSupport_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES)
|
||||
|
||||
libSupport_la_SOURCES = ../Prelude.h $(Support_SRCS)
|
||||
libSupport_a_SOURCES = ../Prelude.h $(Support_SRCS)
|
||||
|
||||
RANLIB = echo
|
||||
libSupport_a_AR = $(LD) -r -o
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
MAINTAINERCLEANFILES = Makefile.in
|
||||
|
||||
noinst_LTLIBRARIES = libBase.la
|
||||
noinst_LIBRARIES = libBase.a
|
||||
|
||||
# get our env
|
||||
include ../../templates/dtinfo_env.mk
|
||||
|
|
@ -8,9 +8,12 @@ include ../../templates/dtinfo_env.mk
|
|||
# class info
|
||||
include Classlist.mk
|
||||
|
||||
libBase_la_CXXFLAGS = -I.. -I ../.. -I../Support $(DTINFO_DEFINES) \
|
||||
libBase_a_CXXFLAGS = -I.. -I ../.. -I../Support $(DTINFO_DEFINES) \
|
||||
$(DTINFO_INCLUDES)
|
||||
libBase_la_SOURCES = $(Base_SRCS)
|
||||
libBase_a_SOURCES = $(Base_SRCS)
|
||||
|
||||
RANLIB = echo
|
||||
libBase_a_AR = $(LD) -r -o
|
||||
|
||||
BUILT_SOURCES = Base.msg
|
||||
CLEANFILES = $(BUILT_SOURCES)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
MAINTAINERCLEANFILES = Makefile.in
|
||||
|
||||
noinst_LTLIBRARIES = libDtSR.la
|
||||
noinst_LIBRARIES = libDtSR.a
|
||||
|
||||
# get our env
|
||||
include ../../templates/dtinfo_env.mk
|
||||
|
|
@ -8,9 +8,12 @@ include ../../templates/dtinfo_env.mk
|
|||
# class info
|
||||
include Classlist.mk
|
||||
|
||||
libDtSR_la_CXXFLAGS = -I../Base -I./Util_Classes -I../.. \
|
||||
libDtSR_a_CXXFLAGS = -I../Base -I./Util_Classes -I../.. \
|
||||
$(DTINFO_DEFINES) $(DTINFO_INCLUDES)
|
||||
libDtSR_la_SOURCES = $(DtSR_SRCS)
|
||||
libDtSR_a_SOURCES = $(DtSR_SRCS)
|
||||
|
||||
RANLIB = echo
|
||||
libDtSR_a_AR = $(LD) -r -o
|
||||
|
||||
BUILT_SOURCES = DtSR.msg
|
||||
CLEANFILES = $(BUILT_SOURCES)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
MAINTAINERCLEANFILES = Makefile.in
|
||||
|
||||
noinst_LTLIBRARIES = libMMDB.la
|
||||
noinst_LIBRARIES = libMMDB.a
|
||||
|
||||
# get our env
|
||||
include ../../templates/dtinfo_env.mk
|
||||
|
|
@ -8,9 +8,13 @@ include ../../templates/dtinfo_env.mk
|
|||
# class info
|
||||
include Classlist.mk
|
||||
|
||||
libMMDB_la_CXXFLAGS = -I../Base -I../.. $(DTINFO_DEFINES) \
|
||||
libMMDB_a_CXXFLAGS = -I../Base -I../.. $(DTINFO_DEFINES) \
|
||||
$(DTINFO_INCLUDES)
|
||||
libMMDB_la_SOURCES = $(MMDB_SRCS)
|
||||
libMMDB_a_SOURCES = $(MMDB_SRCS)
|
||||
|
||||
RANLIB = echo
|
||||
libMMDB_a_AR = $(LD) -r -o
|
||||
|
||||
|
||||
BUILT_SOURCES = MMDB.msg
|
||||
CLEANFILES = $(BUILT_SOURCES)
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in
|
|||
|
||||
SUBDIRS = Base MMDB DtSR
|
||||
|
||||
noinst_LTLIBRARIES = libUAS.la
|
||||
noinst_LIBRARIES = libUAS.a
|
||||
|
||||
# get our env
|
||||
include ../templates/dtinfo_env.mk
|
||||
|
|
@ -10,11 +10,13 @@ include ../templates/dtinfo_env.mk
|
|||
# class info
|
||||
include Classlist.mk
|
||||
|
||||
libUAS_la_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES)
|
||||
libUAS_la_SOURCES =
|
||||
# this should make sure this is linked with a C++ compiler
|
||||
nodist_EXTRA_libUAS_la_SOURCES = dummy.cxx
|
||||
libUAS_la_LIBADD = Base/libBase.la MMDB/libMMDB.la DtSR/libDtSR.la
|
||||
libUAS_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES)
|
||||
libUAS_a_SOURCES =
|
||||
|
||||
libUAS_a_LIBADD = Base/libBase.a MMDB/libMMDB.a DtSR/libDtSR.a
|
||||
|
||||
RANLIB = echo
|
||||
libUAS_a_AR = $(LD) -r -o
|
||||
|
||||
noinst_DATA = UAS.msg
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +1,15 @@
|
|||
MAINTAINERCLEANFILES = Makefile.in
|
||||
|
||||
noinst_LTLIBRARIES = libWidgets.la
|
||||
noinst_LIBRARIES = libWidgets.a
|
||||
|
||||
# get our env
|
||||
include ../templates/dtinfo_env.mk
|
||||
|
||||
libWidgets_la_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES)
|
||||
libWidgets_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES)
|
||||
|
||||
libWidgets_la_SOURCES = Pixmap.c Tree.c Panner.c Simple.c Porthole.c \
|
||||
libWidgets_a_SOURCES = Pixmap.c Tree.c Panner.c Simple.c Porthole.c \
|
||||
XawInitFake.c TabButton.c Restraint.c WXmOpButton.C
|
||||
|
||||
RANLIB = echo
|
||||
libWidgets_a_AR = $(LD) -r -o
|
||||
|
||||
|
|
|
|||
|
|
@ -1,18 +1,22 @@
|
|||
MAINTAINERCLEANFILES = Makefile.in
|
||||
|
||||
noinst_LTLIBRARIES = libcgm.la
|
||||
noinst_LIBRARIES = libcgm.a
|
||||
|
||||
# get our env
|
||||
include ../templates/dtinfo_env.mk
|
||||
|
||||
# class info
|
||||
libcgm_la_CFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) \
|
||||
libcgm_a_CFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) \
|
||||
-I$(top_srcdir)/include/DtI
|
||||
|
||||
libcgm_la_SOURCES = cgmcmds.c cgmcommon.c cgmio.c cgmtext.c getcgm.c
|
||||
libcgm_a_SOURCES = cgmcmds.c cgmcommon.c cgmio.c cgmtext.c getcgm.c
|
||||
RANLIB = echo
|
||||
libcgm_a_AR = $(LD) -r -o
|
||||
|
||||
noinst_PROGRAMS = testcgm
|
||||
testcgm_CPPFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) \
|
||||
-I$(top_srcdir)/include/DtI
|
||||
testcgm_SOURCES = testcgm.c
|
||||
testcgm_LDADD = libcgm.la $(DTCLIENTLIBS) $(XTOOLLIB)
|
||||
testcgm_LDADD = libcgm.a $(DTCLIENTLIBS) $(XTOOLLIB)
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -31,9 +31,7 @@ WWL_INCLUDES = -I$(WWL)/include
|
|||
WWL_LIBS=$(STATIC) -L$(WWL)/src -lWWL
|
||||
EXCEPTIONS_INCLUDES = -I$(EXCEPTIONS)
|
||||
MMDB_INCLUDES = -I$(MMDB)
|
||||
#MMDB_LIBS=$(STATIC) -L$(OLIAS)/mmdb -lMMDB
|
||||
MMDB_LIBS=$(OLIAS)/mmdb/libMMDB.la
|
||||
#MMDB_LIBS= $(OLIAS)/DtMmdb/libDtMmdb.la
|
||||
UAS_INCLUDES = -I$(UAS)/Base
|
||||
COMMON_CLASS_INCLUDES = -I$(MMDB)/dti_cc -I$(MMDB)
|
||||
COMMON_CLASS_LIBDIR = $(STATIC) -L$(MMDB)/dti_cc
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue