diff options
| author | Jussi Pakkanen <jussi.pakkanen@canonical.com> | 2012-02-02 14:36:32 +0200 |
|---|---|---|
| committer | Chase Douglas <chase.douglas@canonical.com> | 2012-02-02 11:51:29 -0800 |
| commit | 24fbaa20c179ce4b4d9be9627bb41daffc91527a (patch) | |
| tree | da76e468c911b5953920260211f3644fddad79a0 /Makefile.am | |
| parent | 79b2d4e7f976621705bd32a9fd16e56c989a5a45 (diff) | |
Fix build system.
The project could not be built from scratch due to erroneous
Autofoo setup. This commit makes it work.
Signed-off-by: Jussi Pakkanen <jussi.pakkanen@canonical.com>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 35 |
1 files changed, 1 insertions, 34 deletions
diff --git a/Makefile.am b/Makefile.am index d10bca8..5bdde0e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,43 +1,10 @@ -SUBDIRS = doc examples - -lib_LTLIBRARIES = libxorg-gtest.la libxorg-gtest_main.la - -libxorg_gtest_la_SOURCES = \ - src/environment.cpp \ - src/process.cpp \ - src/test.cpp - -libxorg_gtest_la_CPPFLAGS = \ - $(AM_CPPFLAGS) \ - $(GTEST_CPPFLAGS) - -libxorg_gtest_main_la_SOURCES = \ - src/main.cpp - -library_includedir = $(includedir)/xorg/gtest -library_include_HEADERS = \ - include/xorg/gtest/environment.h \ - include/xorg/gtest/process.h \ - include/xorg/gtest/test.h - -library_datadir = $(datadir)/xorg/gtest -library_data_DATA = conf/dummy.conf - -libxorg_gtest_main_la_CPPFLAGS = \ - $(AM_CPPFLAGS) \ - $(GTEST_CPPFLAGS) \ - -DDUMMY_CONF_PATH="\"$(library_datadir)/dummy.conf\"" - -libxorg_gtest_la_LDFLAGS = $(X11_LIBS) -libxorg_gtest_main_la_LDFLAGS = $(X11_LIBS) +SUBDIRS = src doc examples pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xorg-gtest.pc ACLOCAL_AMFLAGS = -I m4 -AM_CXXFLAGS = -Iinclude - .PHONY: ChangeLog INSTALL INSTALL: $(INSTALL_CMD) |