diff options
author | Chase Douglas <chase.douglas@ubuntu.com> | 2011-12-05 10:46:07 -0800 |
---|---|---|
committer | Chase Douglas <chase.douglas@ubuntu.com> | 2011-12-05 10:46:07 -0800 |
commit | d401f679f3e9161bbb06ce33bf48678c74329cd0 (patch) | |
tree | 8b8a57d2854e11977a3766905e8edc0583f06182 /Makefile.am | |
parent | 1ff7a967e0648d6f71bf3bc30e3642431765da7e (diff) |
Rename to xorg-gtest, move some files around, make some fixes
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am index cd40809..d76db3e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,23 +1,24 @@ -lib_LTLIBRARIES = libxtestingenvironment.la libxtestingenvironment_main.la +lib_LTLIBRARIES = libxorg-gtest.la libxorg-gtest_main.la -libxtestingenvironment_la_SOURCES = \ +libxorg_gtest_la_SOURCES = \ src/environment.cpp -libxtestingenvironment_main_la_SOURCES = \ - src/environment.cpp \ +libxorg_gtest_main_la_SOURCES = \ src/main.cpp -library_includedir=$(includedir)/xtestingenvironment-1.0/xtestingenvironment -library_include_HEADERS = src/environment.h +library_includedir=$(includedir)/xorg/gtest +library_include_HEADERS = include/xorg/gtest/environment.h -library_datadir=$(datadir)/xtestingenvironment-1.0 +library_datadir=$(datadir)/xorg/gtest library_data_DATA=conf/dummy.conf -libxtestingenvironment_la_LDFLAGS = $(X11_LIBS) $(GTEST_LDFLAGS) -libxtestingenvironment_main_la_LDFLAGS = $(X11_LIBS) $(GTEST_LDFLAGS) +libxorg_gtest_la_LDFLAGS = $(X11_LIBS) +libxorg_gtest_main_la_LDFLAGS = $(X11_LIBS) ACLOCAL_AMFLAGS = -I m4 +AM_CXXFLAGS = -Iinclude + .PHONY: ChangeLog INSTALL INSTALL: $(INSTALL_CMD) |