fly/flightgear
1
0
Fork 0
Code Activity

Code reorganizations. Added a Lib/ directory for more general libraries.

Browse source
This commit is contained in:
curt 1998-04-14 02:43:57 +00:00
parent 1f7da4f54e
commit e4a1a341cc
2 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
DEM/Makefile.am
View file

@ -4,5 +4,10 @@ lib_LTLIBRARIES = libDEM.la
libDEM_la_SOURCES = dem.cxx dem.hxx leastsqs.cxx leastsqs.hxx
INCLUDES += -I../../Simulator
INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib
# We can't build this with "-O2" (optimization) since this causes a seg fault
# I haven't found a way to strip this out of the CXXFLAGS, so I'm just
# setting it to "-g"
CXXFLAGS = -g

18
DEM/Makefile.in
View file

@ -75,13 +75,18 @@ libdir = ${exec_prefix}/lib
lib_LTLIBRARIES = libDEM.la
libDEM_la_SOURCES = dem.cxx dem.hxx leastsqs.cxx leastsqs.hxx
# We can't build this with "-O2" (optimization) since this causes a seg fault
# I haven't found a way to strip this out of the CXXFLAGS, so I'm just
# setting it to "-g"
CXXFLAGS = -g
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../../Simulator/Include/config.h
CONFIG_HEADER = ../../Include/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES)
DEFS = @DEFS@ -I. -I$(srcdir) -I../../Simulator/Include
DEFS = @DEFS@ -I. -I$(srcdir) -I../../Include
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
@ -92,7 +97,6 @@ X_PRE_LIBS = @X_PRE_LIBS@
libDEM_la_LDFLAGS =
libDEM_la_LIBADD =
libDEM_la_OBJECTS = dem.lo leastsqs.lo
CXXFLAGS = @CXXFLAGS@
CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS)
LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS)
CXXLINK = $(LIBTOOL) --mode=link $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@
@ -113,7 +117,7 @@ all: Makefile $(LTLIBRARIES)
.SUFFIXES:
.SUFFIXES: .S .c .cxx .lo .o .s
$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnu Tools/DEM/Makefile
cd $(top_srcdir) && $(AUTOMAKE) --gnu Lib/DEM/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
cd $(top_builddir) \
@ -211,14 +215,14 @@ maintainer-clean-tags:
distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
subdir = Tools/DEM
subdir = Lib/DEM
distdir: $(DISTFILES)
here=`cd $(top_builddir) && pwd`; \
top_distdir=`cd $(top_distdir) && pwd`; \
distdir=`cd $(distdir) && pwd`; \
cd $(top_srcdir) \
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Tools/DEM/Makefile
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Lib/DEM/Makefile
@for file in $(DISTFILES); do \
d=$(srcdir); \
test -f $(distdir)/$$file \
@ -328,7 +332,7 @@ installdirs mostlyclean-generic distclean-generic clean-generic \
maintainer-clean-generic clean mostlyclean distclean maintainer-clean
INCLUDES += -I../../Simulator
INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.