projects
/
rodin
/
chimara.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Properly set up svn:ignore properties.
[rodin/chimara.git]
/
src
/
Makefile.am
diff --git
a/src/Makefile.am
b/src/Makefile.am
old mode 100755
(executable)
new mode 100644
(file)
index
ee0385c
..
e34db8b
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-8,22
+8,23
@@
AM_CPPFLAGS = \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
- $(CHIMARA_CFLAGS)
+ @CHIMARA_CFLAGS@
AM_CFLAGS =\
-Wall\
-g
AM_CFLAGS =\
-Wall\
-g
-
bin
_PROGRAMS = test-chimara
+
noinst
_PROGRAMS = test-chimara
test_chimara_SOURCES = main.c callbacks.c callbacks.h error.c error.h
test_chimara_SOURCES = main.c callbacks.c callbacks.h error.c error.h
-test_chimara_LDADD =
$(TEST_LIBS) libchimara.l
a
+test_chimara_LDADD =
@TEST_LIBS@ -lchimar
a
lib_LTLIBRARIES = libchimara.la
libchimara_la_SOURCES = \
abort.c abort.h \
case.c \
lib_LTLIBRARIES = libchimara.la
libchimara_la_SOURCES = \
abort.c abort.h \
case.c \
+ charset.c charset.h \
chimara-glk.c chimara-glk.h chimara-glk-private.h \
event.c event.h \
fileref.c fileref.h \
chimara-glk.c chimara-glk.h chimara-glk-private.h \
event.c event.h \
fileref.c fileref.h \
@@
-33,21
+34,23
@@
libchimara_la_SOURCES = \
stream.c stream.h \
strio.c \
style.c \
stream.c stream.h \
strio.c \
style.c \
- window.c window.h
-libchimara_la_LIBADD = $(CHIMARA_LIBS)
+ window.c window.h
+
+libchimara_la_LIBADD = @CHIMARA_LIBS@
libchimara_la_LDFLAGS = -no-undefined -export-symbols-regex "^chimara_glk_.*|^glk_.*"
libchimara_includedir = $(includedir)/chimara/chimara
libchimara_include_HEADERS = chimara-glk.h
libchimara_la_LDFLAGS = -no-undefined -export-symbols-regex "^chimara_glk_.*|^glk_.*"
libchimara_includedir = $(includedir)/chimara/chimara
libchimara_include_HEADERS = chimara-glk.h
-pkglib_LTLIBRARIES = first.la model.la
-
+PLUGIN_LDFLAGS = -module -shared -avoid-version -export-symbols-regex "glk_main"
+pkglib_LTLIBRARIES = first.la model.la gridtest.la splittest.la
first_la_SOURCES = first.c
first_la_SOURCES = first.c
-first_la_LIBADD = libchimara.la
-first_la_LDFLAGS = -module -avoid-version
-
+first_la_LDFLAGS = $(PLUGIN_LDFLAGS)
model_la_SOURCES = model.c
model_la_SOURCES = model.c
-model_la_LIBADD = libchimara.la
-model_la_LDFLAGS = -module -avoid-version
+model_la_LDFLAGS = $(PLUGIN_LDFLAGS)
+gridtest_la_SOURCES = gridtest.c
+gridtest_la_LDFLAGS = $(PLUGIN_LDFLAGS)
+splittest_la_SOURCES = splittest.c
+splittest_la_LDFLAGS = $(PLUGIN_LDFLAGS)
CLEANFILES = chimara.ui
CLEANFILES = chimara.ui