aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLev Walkin <vlm@lionet.info>2004-08-18 04:47:49 +0000
committerLev Walkin <vlm@lionet.info>2004-08-18 04:47:49 +0000
commitd612ce2bee706bac1d7a1db30d6833a6daf2db4d (patch)
tree379132573bce37c87014525112e2b9de50a385e3
parente0b650ecb28e141ee165e073270c4122d4b7368c (diff)
rearranged deps
-rw-r--r--libasn1compiler/Makefile.am12
-rw-r--r--libasn1compiler/Makefile.in22
2 files changed, 13 insertions, 21 deletions
diff --git a/libasn1compiler/Makefile.am b/libasn1compiler/Makefile.am
index 301bbaa5..ef96aef9 100644
--- a/libasn1compiler/Makefile.am
+++ b/libasn1compiler/Makefile.am
@@ -16,14 +16,10 @@ libasn1compiler_la_SOURCES = \
asn1c_compat.c asn1c_compat.h \
asn1c_internal.h
-libasn1compiler_la_LIBADD = \
- ${top_builddir}/libasn1parser/libasn1parser.la \
- ${top_builddir}/libasn1fix/libasn1fix.la
+TESTS = $(check_PROGRAMS)
check_PROGRAMS = check_compiler
-TESTS = ${check_PROGRAMS}
-
-LDADD = ${noinst_LTLIBRARIES} ${libasn1compiler_la_LIBADD}
-DEPENDENCIES = ${LDADD}
-
+check_compiler_LDADD = $(noinst_LTLIBRARIES) \
+ $(top_builddir)/libasn1parser/libasn1parser.la \
+ $(top_builddir)/libasn1fix/libasn1fix.la
diff --git a/libasn1compiler/Makefile.in b/libasn1compiler/Makefile.in
index 64c00377..d50f04ac 100644
--- a/libasn1compiler/Makefile.in
+++ b/libasn1compiler/Makefile.in
@@ -50,21 +50,18 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
-libasn1compiler_la_DEPENDENCIES = \
- ${top_builddir}/libasn1parser/libasn1parser.la \
- ${top_builddir}/libasn1fix/libasn1fix.la
+libasn1compiler_la_LIBADD =
am_libasn1compiler_la_OBJECTS = asn1compiler.lo asn1c_misc.lo \
asn1c_out.lo asn1c_lang.lo asn1c_save.lo asn1c_C.lo \
asn1c_compat.lo
libasn1compiler_la_OBJECTS = $(am_libasn1compiler_la_OBJECTS)
check_compiler_SOURCES = check_compiler.c
check_compiler_OBJECTS = check_compiler.$(OBJEXT)
-check_compiler_LDADD = $(LDADD)
am__DEPENDENCIES_1 = libasn1compiler.la
-am__DEPENDENCIES_2 = ${top_builddir}/libasn1parser/libasn1parser.la \
- ${top_builddir}/libasn1fix/libasn1fix.la
check_compiler_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_2)
+ $(top_builddir)/libasn1parser/libasn1parser.la \
+ $(top_builddir)/libasn1cnst/libasn1cnst.la \
+ $(top_builddir)/libasn1fix/libasn1fix.la
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@@ -215,13 +212,12 @@ libasn1compiler_la_SOURCES = \
asn1c_compat.c asn1c_compat.h \
asn1c_internal.h
-libasn1compiler_la_LIBADD = \
- ${top_builddir}/libasn1parser/libasn1parser.la \
- ${top_builddir}/libasn1fix/libasn1fix.la
+TESTS = $(check_PROGRAMS)
+check_compiler_LDADD = $(noinst_LTLIBRARIES) \
+ $(top_builddir)/libasn1parser/libasn1parser.la \
+ $(top_builddir)/libasn1cnst/libasn1cnst.la \
+ $(top_builddir)/libasn1fix/libasn1fix.la
-TESTS = ${check_PROGRAMS}
-LDADD = ${noinst_LTLIBRARIES} ${libasn1compiler_la_LIBADD}
-DEPENDENCIES = ${LDADD}
all: all-am
.SUFFIXES: