[lasem] Remove circular dependency on lsmenumtypes.h.
- From: Emmanuel Pacaud <emmanuel src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [lasem] Remove circular dependency on lsmenumtypes.h.
- Date: Sun, 4 Oct 2009 11:57:58 +0000 (UTC)
commit 510f9e77f92fd119728a032b3c08380eee82e380
Author: Jorn Baayen <jorn baayen gmail com>
Date: Sun Oct 4 13:57:10 2009 +0200
Remove circular dependency on lsmenumtypes.h.
Signed-off-by: Emmanuel Pacaud <emmanuel pacaud lapp in2p3 fr>
src/Makefile.am | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index df540f7..8c97298 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,7 +19,7 @@ liblasem_la_LIBADD = \
$(LASEM_LIBS)
liblasem_la_SOURCES = \
- lsmenumtypes.c \
+ lsmenumtypes.c \
lsmdebug.c \
lsmstr.c \
lsmtraits.c \
@@ -100,10 +100,8 @@ liblasem_la_SOURCES = \
lsmsvgpatternelement.c \
lsmsvgmaskelement.c
-liblasem_ladir = $(includedir)/lasem
-liblasem_la_HEADERS = \
+LASEM_HDRS = \
lsm.h \
- lsmenumtypes.h \
lsmstr.h \
lsmdebug.h \
lsmtraits.h \
@@ -188,10 +186,14 @@ liblasem_la_HEADERS = \
lsmsvgpatternelement.h \
lsmsvgmaskelement.h
-lsmenumtypes.h: lsmenumtypes.h.template $(liblasem_la_HEADERS) $(GLIB_MKENUMS)
+liblasem_ladir = $(includedir)/lasem
+liblasem_la_HEADERS = $(LASEM_HDRS)
+liblasem_la_HEADERS += lsmenumtypes.h
+
+lsmenumtypes.h: lsmenumtypes.h.template $(LASEM_HDRS) $(GLIB_MKENUMS)
$(AM_V_GEN) (cd $(srcdir) && $(GLIB_MKENUMS) --template lsmenumtypes.h.template $(liblasem_la_HEADERS)) > $@
-lsmenumtypes.c: lsmenumtypes.c.template $(liblasem_la_HEADERS) $(GLIB_MKENUMS)
+lsmenumtypes.c: lsmenumtypes.c.template $(LASEM_HDRS) $(GLIB_MKENUMS)
$(AM_V_GEN) (cd $(srcdir) && $(GLIB_MKENUMS) --template lsmenumtypes.c.template $(liblasem_la_HEADERS)) > $@
bin_PROGRAMS = lasemtest lasemrender
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]