diff options
| author | Dana Jansens <danakj@orodu.net> | 2003-02-05 15:38:29 +0000 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2003-02-05 15:38:29 +0000 |
| commit | 7c8c9e998ffc3a9b22e15feeffe77823142ce531 (patch) | |
| tree | 703b1db62f68f85d97a01a265fd73d18d9b24682 /otk | |
| parent | ffea5b55912ea936c84ce3d17577e9532a81cae4 (diff) | |
new swig build system. much better. yay.
Diffstat (limited to 'otk')
| -rw-r--r-- | otk/Makefile.am | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/otk/Makefile.am b/otk/Makefile.am index feeda741..08f4d4cd 100644 --- a/otk/Makefile.am +++ b/otk/Makefile.am @@ -2,8 +2,7 @@ buttonsdir = $(pkgdatadir)/buttons includeotkdir = $(includedir)/otk pkgconfigdir = $(libdir)/pkgconfig -CXXFLAGS=$(XFT_CFLAGS) @CXXFLAGS@ \ --DBUTTONSDIR=\"$(buttonsdir)\" +CPPFLAGS=$(XFT_CFLAGS) @CPPFLAGS@ -DBUTTONSDIR=\"$(buttonsdir)\" #noinst_LIBRARIES=libotk.a lib_LTLIBRARIES=libotk.la @@ -35,12 +34,12 @@ otk.pc: otk.pc.in @srcdir@/$^ > $@ distclean-local: - rm -f *\~ *.orig *.rej .\#* + $(RM) *\~ *.orig *.rej .\#* otk_test: libotk.la otk_test.cc - $(CXX) $(CXXFLAGS) -DHAVE_CONFIG_H -I. -I. -I.. -I../src $(XFT_CFLAGS) -Wall -W -pedantic -DNDEBUG -g -O2 -o otk_test otk_test.cc $(XFT_LIBS) -L. -lotk @LIBS@ + $(CXX) $(CPPFLAGS) $(CXXFLAGS) -DHAVE_CONFIG_H -I. -I. -I.. -I../src $(XFT_CFLAGS) -Wall -W -pedantic -DNDEBUG -g -O2 -o otk_test otk_test.cc $(XFT_LIBS) -L. -lotk @LIBS@ rendertest: libotk.la rendertest.cc - $(CXX) $(CXXFLAGS) -DHAVE_CONFIG_H -I. -I. -I.. -I../src $(XFT_CFLAGS) -Wall -W -pedantic -DNDEBUG -g -O2 -o $@ rendertest.cc $(XFT_LIBS) -L. -lotk @LIBS@ + $(CXX) $(CPPFLAGS) $(CXXFLAGS) -DHAVE_CONFIG_H -I. -I. -I.. -I../src $(XFT_CFLAGS) -Wall -W -pedantic -DNDEBUG -g -O2 -o $@ rendertest.cc $(XFT_LIBS) -L. -lotk @LIBS@ # local dependencies |