Code reorganizations. Added a Lib/ directory for more general libraries.
This commit is contained in:
parent
ff4d6034cc
commit
0be91bc7b3
2 changed files with 15 additions and 6 deletions
10
Makefile.in
10
Makefile.in
|
@ -38,7 +38,7 @@ pkgdatadir = $(datadir)/@PACKAGE@
|
||||||
pkglibdir = $(libdir)/@PACKAGE@
|
pkglibdir = $(libdir)/@PACKAGE@
|
||||||
pkgincludedir = $(includedir)/@PACKAGE@
|
pkgincludedir = $(includedir)/@PACKAGE@
|
||||||
|
|
||||||
top_builddir = ../..
|
top_builddir = ..
|
||||||
|
|
||||||
ACLOCAL = @ACLOCAL@
|
ACLOCAL = @ACLOCAL@
|
||||||
AUTOCONF = @AUTOCONF@
|
AUTOCONF = @AUTOCONF@
|
||||||
|
@ -94,7 +94,7 @@ all: Makefile config.h
|
||||||
|
|
||||||
.SUFFIXES:
|
.SUFFIXES:
|
||||||
$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
|
$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
|
||||||
cd $(top_srcdir) && $(AUTOMAKE) --gnu Simulator/Include/Makefile
|
cd $(top_srcdir) && $(AUTOMAKE) --gnu Include/Makefile
|
||||||
|
|
||||||
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
|
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
|
||||||
cd $(top_builddir) \
|
cd $(top_builddir) \
|
||||||
|
@ -105,7 +105,7 @@ config.h: stamp-h
|
||||||
@:
|
@:
|
||||||
stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
|
stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
|
||||||
cd $(top_builddir) \
|
cd $(top_builddir) \
|
||||||
&& CONFIG_FILES= CONFIG_HEADERS=Simulator/Include/config.h \
|
&& CONFIG_FILES= CONFIG_HEADERS=Include/config.h \
|
||||||
$(SHELL) ./config.status
|
$(SHELL) ./config.status
|
||||||
@echo timestamp > stamp-h
|
@echo timestamp > stamp-h
|
||||||
$(srcdir)/config.h.in: @MAINT@$(srcdir)/stamp-h.in
|
$(srcdir)/config.h.in: @MAINT@$(srcdir)/stamp-h.in
|
||||||
|
@ -127,14 +127,14 @@ TAGS:
|
||||||
|
|
||||||
distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
|
distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
|
||||||
|
|
||||||
subdir = Simulator/Include
|
subdir = Include
|
||||||
|
|
||||||
distdir: $(DISTFILES)
|
distdir: $(DISTFILES)
|
||||||
here=`cd $(top_builddir) && pwd`; \
|
here=`cd $(top_builddir) && pwd`; \
|
||||||
top_distdir=`cd $(top_distdir) && pwd`; \
|
top_distdir=`cd $(top_distdir) && pwd`; \
|
||||||
distdir=`cd $(distdir) && pwd`; \
|
distdir=`cd $(distdir) && pwd`; \
|
||||||
cd $(top_srcdir) \
|
cd $(top_srcdir) \
|
||||||
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Simulator/Include/Makefile
|
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Include/Makefile
|
||||||
@for file in $(DISTFILES); do \
|
@for file in $(DISTFILES); do \
|
||||||
d=$(srcdir); \
|
d=$(srcdir); \
|
||||||
test -f $(distdir)/$$file \
|
test -f $(distdir)/$$file \
|
||||||
|
|
11
config.h.in
11
config.h.in
|
@ -1,4 +1,4 @@
|
||||||
/* Simulator/Include/config.h.in. Generated automatically from configure.in by autoheader. */
|
/* Include/config.h.in. Generated automatically from configure.in by autoheader. */
|
||||||
|
|
||||||
/* Define to empty if the keyword does not work. */
|
/* Define to empty if the keyword does not work. */
|
||||||
#undef const
|
#undef const
|
||||||
|
@ -132,12 +132,18 @@
|
||||||
/* Define if you have the GLcore library (-lGLcore). */
|
/* Define if you have the GLcore library (-lGLcore). */
|
||||||
#undef HAVE_LIBGLCORE
|
#undef HAVE_LIBGLCORE
|
||||||
|
|
||||||
|
/* Define if you have the ICE library (-lICE). */
|
||||||
|
#undef HAVE_LIBICE
|
||||||
|
|
||||||
/* Define if you have the MesaGL library (-lMesaGL). */
|
/* Define if you have the MesaGL library (-lMesaGL). */
|
||||||
#undef HAVE_LIBMESAGL
|
#undef HAVE_LIBMESAGL
|
||||||
|
|
||||||
/* Define if you have the MesaGLU library (-lMesaGLU). */
|
/* Define if you have the MesaGLU library (-lMesaGLU). */
|
||||||
#undef HAVE_LIBMESAGLU
|
#undef HAVE_LIBMESAGLU
|
||||||
|
|
||||||
|
/* Define if you have the SM library (-lSM). */
|
||||||
|
#undef HAVE_LIBSM
|
||||||
|
|
||||||
/* Define if you have the X11 library (-lX11). */
|
/* Define if you have the X11 library (-lX11). */
|
||||||
#undef HAVE_LIBX11
|
#undef HAVE_LIBX11
|
||||||
|
|
||||||
|
@ -150,6 +156,9 @@
|
||||||
/* Define if you have the Xmu library (-lXmu). */
|
/* Define if you have the Xmu library (-lXmu). */
|
||||||
#undef HAVE_LIBXMU
|
#undef HAVE_LIBXMU
|
||||||
|
|
||||||
|
/* Define if you have the Xt library (-lXt). */
|
||||||
|
#undef HAVE_LIBXT
|
||||||
|
|
||||||
/* Define if you have the glut library (-lglut). */
|
/* Define if you have the glut library (-lglut). */
|
||||||
#undef HAVE_LIBGLUT
|
#undef HAVE_LIBGLUT
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue