Don't hardcode the top-level include path.

pull/110/head
Pat Suwalski 2011-01-21 22:26:59 +00:00
parent 682371b85a
commit 3152634369
10 changed files with 10 additions and 12 deletions

View File

@ -5,7 +5,7 @@ noinst_DATA = $(dosstuff)
EXTRA_DIST = $(noinst_DATA)
INCLUDES = -I.. -I$(top_srcdir)/thirdparty/Eigen
INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/thirdparty/Eigen
libcel3ds_a_SOURCES = \
3dsmodel.cpp \

View File

@ -6,7 +6,7 @@ noinst_DATA = $(dosstuff)
EXTRA_DIST = \
$(noinst_DATA)
INCLUDES = -I.. -I$(top_srcdir)/thirdparty/Eigen -I$(top_srcdir)/thirdparty/curveplot/include \
INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/thirdparty/Eigen -I$(top_srcdir)/thirdparty/curveplot/include \
-I$(top_srcdir)/thirdparty/glew/include
libcelengine_a_CXXFLAGS = $(LUA_CFLAGS) $(SPICE_CFLAGS)

View File

@ -1,7 +1,7 @@
noinst_LIBRARIES = libcelephem.a
noinst_HEADERS = $(wildcard *.h)
INCLUDES = -I.. -I$(top_srcdir)/thirdparty/Eigen
INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/thirdparty/Eigen
if ENABLE_SPICE
SPICESOURCES = spiceinterface.cpp spiceorbit.cpp spicerotation.cpp

View File

@ -1,7 +1,7 @@
SUBDIRS =
bin_PROGRAMS = celestia
INCLUDES = -I.. -I$(top_srcdir)/thirdparty/Eigen -I$(top_srcdir)/thirdparty/glew/include
INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/thirdparty/Eigen -I$(top_srcdir)/thirdparty/glew/include
DEFS = -DCONFIG_DATA_DIR='"$(PKGDATADIR)"' -DLOCALEDIR='"$(datadir)/locale"' @DEFS@

View File

@ -1,6 +1,6 @@
SUBDIRS = data
INCLUDES = -I../.. -I$(top_srcdir)/thirdparty/Eigen -I$(top_srcdir)/thirdparty/glew/include
INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/thirdparty/Eigen -I$(top_srcdir)/thirdparty/glew/include
DEFS = -DCONFIG_DATA_DIR='"$(PKGDATADIR)"' -DLOCALEDIR='"$(datadir)/locale"' @DEFS@

View File

@ -30,7 +30,7 @@ if ENABLE_KDE
noinst_LIBRARIES = libkdegui.a
noinst_HEADERS = $(wildcard *.h)
INCLUDES = -I../.. -I.. -I$(top_srcdir)/thirdparty/Eigen -I$(top_srcdir)/thirdparty/glew/include $(QT_INCLUDES) $(KDE_INCLUDES)
INCLUDES = $(top_srcdir)/src -I$(top_srcdir)/thirdparty/Eigen -I$(top_srcdir)/thirdparty/glew/include $(QT_INCLUDES) $(KDE_INCLUDES)
libkdegui_a_CXXFLAGS = $(LUA_CFLAGS) $(THEORA_CFLAGS)

View File

@ -75,7 +75,7 @@ if ENABLE_QT
noinst_LIBRARIES = libqtgui.a
noinst_HEADERS = $(QT_HEADERS)
INCLUDES = -I../.. -I.. -I$(top_srcdir)/thirdparty/Eigen -I$(top_srcdir)/thirdparty/glew/include
INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/thirdparty/Eigen -I$(top_srcdir)/thirdparty/glew/include
BUILT_SOURCES = $(MOC_CPP_FILES) $(QRC_CPP_FILES) $(UI_H_FILES)

View File

@ -5,7 +5,7 @@ noinst_DATA = $(dosstuff)
EXTRA_DIST = $(noinst_DATA)
INCLUDES = -I.. -I$(top_srcdir)/thirdparty/Eigen
INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/thirdparty/Eigen
libcelmath_a_SOURCES = \
frustum.cpp \

View File

@ -1,7 +1,7 @@
noinst_LIBRARIES = libcelmodel.a
noinst_HEADERS = $(wildcard *.h)
INCLUDES = -I.. -I$(top_srcdir)/thirdparty/Eigen
INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/thirdparty/Eigen
libcelmodel_a_SOURCES = \
material.cpp \

View File

@ -5,9 +5,7 @@ noinst_DATA = $(dosstuff)
EXTRA_DIST = $(noinst_DATA)
INCLUDES = -I.. -I$(top_srcdir)/thirdparty/glew/include
INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/thirdparty/glew/include
libceltxf_a_SOURCES = \
texturefont.cpp