stop specifying explicit DEPENDENCIES by listing the .la files in LDADD
This commit is contained in:
		| @ -1,6 +1,5 @@ | ||||
| AUTOMAKE_OPTIONS = nostdinc | ||||
|  | ||||
|  | ||||
| CPPFLAGS_COMMON = \ | ||||
| 	-I$(abs_builddir) \ | ||||
| 	-I$(abs_builddir)/../lib  \ | ||||
| @ -9,8 +8,10 @@ CPPFLAGS_COMMON = \ | ||||
| 	-I$(includedir) | ||||
| CFLAGS_COMMON = | ||||
| LDFLAGS_COMMON = -L$(abs_builddir)/../lib -L$(libdir) | ||||
| LIBADD_COMMON = -lhawk  | ||||
| DEPENDENCIES_COMMON = ../lib/libhawk.la | ||||
|  | ||||
| ## specify the libhawk.la file instead of -lhawk.  | ||||
| ##Use -l for third party libraries for automatic inclusion to DEPENDENCIES . | ||||
| LIBADD_COMMON = ../lib/libhawk.la | ||||
|  | ||||
| bin_PROGRAMS = hawk | ||||
|  | ||||
| @ -36,5 +37,4 @@ hawk_LDFLAGS = $(LDFLAGS_COMMON) | ||||
| ## of different behavior depending on the libtool tag. | ||||
| ## | ||||
| hawk_LDADD = $(LIBADD_COMMON) $(LIBM) | ||||
| hawk_DEPENDENCIES = $(DEPENDENCIES_COMMON) | ||||
|  | ||||
|  | ||||
| @ -112,6 +112,7 @@ PROGRAMS = $(bin_PROGRAMS) | ||||
| am_hawk_OBJECTS = hawk-main.$(OBJEXT) | ||||
| hawk_OBJECTS = $(am_hawk_OBJECTS) | ||||
| am__DEPENDENCIES_1 = | ||||
| hawk_DEPENDENCIES = $(LIBADD_COMMON) $(am__DEPENDENCIES_1) | ||||
| AM_V_lt = $(am__v_lt_@AM_V@) | ||||
| am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) | ||||
| am__v_lt_0 = --silent | ||||
| @ -341,8 +342,7 @@ CPPFLAGS_COMMON = \ | ||||
|  | ||||
| CFLAGS_COMMON =  | ||||
| LDFLAGS_COMMON = -L$(abs_builddir)/../lib -L$(libdir) | ||||
| LIBADD_COMMON = -lhawk  | ||||
| DEPENDENCIES_COMMON = ../lib/libhawk.la | ||||
| LIBADD_COMMON = ../lib/libhawk.la | ||||
|  | ||||
| ################################################## | ||||
| # hawk | ||||
| @ -352,7 +352,6 @@ hawk_CPPFLAGS = $(CPPFLAGS_COMMON) | ||||
| hawk_CFLAGS = $(CFLAGS_COMMON) | ||||
| hawk_LDFLAGS = $(LDFLAGS_COMMON) | ||||
| hawk_LDADD = $(LIBADD_COMMON) $(LIBM) | ||||
| hawk_DEPENDENCIES = $(DEPENDENCIES_COMMON) | ||||
| all: all-am | ||||
|  | ||||
| .SUFFIXES: | ||||
|  | ||||
| @ -153,7 +153,6 @@ libhawk_la_CXXFLAGS = $(CXXFLAGS_ALL_COMMON) | ||||
| libhawk_la_LDFLAGS = $(LDFLAGS_ALL_COMMON) -version-info 1:0:0 -no-undefined | ||||
| ## socket() is used in gem-nwif.c and gem-nwif2.c | ||||
| libhawk_la_LIBADD = $(LIBM) $(SOCKET_LIBS) | ||||
| libhawk_la_DEPENDENCIES =  | ||||
|  | ||||
| if ENABLE_LIBLTDL | ||||
| libhawk_la_CPPFLAGS += $(LTDLINCL) | ||||
| @ -201,13 +200,11 @@ libhawk_la_SOURCES += \ | ||||
| libhawk_la_LIBADD += $(SOCKET_LIBS) | ||||
|  | ||||
| if ENABLE_MOD_MYSQL | ||||
| libhawk_la_LIBADD += -lhawk-mysql | ||||
| libhawk_la_DEPENDENCIES += ../mod/libhawk-mysql.la | ||||
| libhawk_la_LIBADD += ../mod/libhawk-mysql.la | ||||
| endif | ||||
|  | ||||
| if ENABLE_MOD_UCI | ||||
| libhawk_la_LIBADD += -lhawk-uci | ||||
| libhawk_la_DEPENDENCIES += ../mod/libhawk-uci.la | ||||
| libhawk_la_LIBADD += ../mod/libhawk-uci.la | ||||
| endif | ||||
|  | ||||
| else | ||||
| @ -219,8 +216,7 @@ CPPFLAGS_MOD_COMMON = $(CPPFLAGS_ALL_COMMON) | ||||
| CFLAGS_MOD_COMMON = $(CFLAGS_ALL_COMMON) | ||||
| CXXFLAGS_MOD_COMMON = $(CXXFLAGS_ALL_COMMON) | ||||
| LDFLAGS_MOD_COMMON = $(LDFLAGS_ALL_COMMON) | ||||
| LIBADD_MOD_COMMON = -lhawk | ||||
| DEPENDENCIES_MOD_COMMON = libhawk.la | ||||
| LIBADD_MOD_COMMON = libhawk.la | ||||
|  | ||||
| #pkglibdir = $(libdir) | ||||
| #pkglib_LTLIBRARIES =  | ||||
| @ -232,7 +228,6 @@ libhawk_hawk_la_CFLAGS = $(CFLAGS_MOD_COMMON) | ||||
| libhawk_hawk_la_CXXFLAGS = $(CXXFLAGS_MOD_COMMON) | ||||
| libhawk_hawk_la_LDFLAGS = $(LDFLAGS_MOD_COMMON) | ||||
| libhawk_hawk_la_LIBADD = $(LIBADD_MOD_COMMON) | ||||
| libhawk_hawk_la_DEPENDENCIES = $(DEPENDENCIES_MOD_COMMON) | ||||
|  | ||||
| pkglib_LTLIBRARIES += libhawk-math.la | ||||
| libhawk_math_la_SOURCES = mod-math.c mod-math.h | ||||
| @ -241,7 +236,6 @@ libhawk_math_la_CFLAGS = $(CFLAGS_MOD_COMMON) | ||||
| libhawk_math_la_CXXFLAGS = $(CXXFLAGS_MOD_COMMON) | ||||
| libhawk_math_la_LDFLAGS = $(LDFLAGS_MOD_COMMON) | ||||
| libhawk_math_la_LIBADD = $(LIBADD_MOD_COMMON) $(LIBM) | ||||
| libhawk_math_la_DEPENDENCIES = $(DEPENDENCIES_MOD_COMMON) | ||||
|  | ||||
| pkglib_LTLIBRARIES += libhawk-str.la | ||||
| libhawk_str_la_SOURCES = mod-str.c mod-str.h | ||||
| @ -250,7 +244,6 @@ libhawk_str_la_CFLAGS = $(CFLAGS_MOD_COMMON) | ||||
| libhawk_str_la_CXXFLAGS = $(CXXFLAGS_MOD_COMMON) | ||||
| libhawk_str_la_LDFLAGS = $(LDFLAGS_MOD_COMMON) | ||||
| libhawk_str_la_LIBADD = $(LIBADD_MOD_COMMON) | ||||
| libhawk_str_la_DEPENDENCIES = $(DEPENDENCIES_MOD_COMMON) | ||||
|  | ||||
| pkglib_LTLIBRARIES += libhawk-sys.la | ||||
| libhawk_sys_la_SOURCES = mod-sys.c mod-sys.h | ||||
| @ -259,7 +252,6 @@ libhawk_sys_la_CFLAGS = $(CFLAGS_MOD_COMMON) | ||||
| libhawk_sys_la_CXXFLAGS = $(CXXFLAGS_MOD_COMMON) | ||||
| libhawk_sys_la_LDFLAGS = $(LDFLAGS_MOD_COMMON) | ||||
| libhawk_sys_la_LIBADD = $(LIBADD_MOD_COMMON) $(SOCKET_LIBS) | ||||
| libhawk_sys_la_DEPENDENCIES = $(DEPENDENCIES_MOD_COMMON) | ||||
|  | ||||
| endif | ||||
|  | ||||
|  | ||||
| @ -106,14 +106,12 @@ host_triplet = @host@ | ||||
| @ENABLE_STATIC_MODULE_TRUE@	mod-sys.c mod-sys.h | ||||
|  | ||||
| @ENABLE_STATIC_MODULE_TRUE@am__append_10 = $(SOCKET_LIBS) | ||||
| @ENABLE_MOD_MYSQL_TRUE@@ENABLE_STATIC_MODULE_TRUE@am__append_11 = -lhawk-mysql | ||||
| @ENABLE_MOD_MYSQL_TRUE@@ENABLE_STATIC_MODULE_TRUE@am__append_12 = ../mod/libhawk-mysql.la | ||||
| @ENABLE_MOD_UCI_TRUE@@ENABLE_STATIC_MODULE_TRUE@am__append_13 = -lhawk-uci | ||||
| @ENABLE_MOD_UCI_TRUE@@ENABLE_STATIC_MODULE_TRUE@am__append_14 = ../mod/libhawk-uci.la | ||||
| @ENABLE_MOD_MYSQL_TRUE@@ENABLE_STATIC_MODULE_TRUE@am__append_11 = ../mod/libhawk-mysql.la | ||||
| @ENABLE_MOD_UCI_TRUE@@ENABLE_STATIC_MODULE_TRUE@am__append_12 = ../mod/libhawk-uci.la | ||||
|  | ||||
| #pkglibdir = $(libdir) | ||||
| #pkglib_LTLIBRARIES =  | ||||
| @ENABLE_STATIC_MODULE_FALSE@am__append_15 = libhawk-hawk.la \ | ||||
| @ENABLE_STATIC_MODULE_FALSE@am__append_13 = libhawk-hawk.la \ | ||||
| @ENABLE_STATIC_MODULE_FALSE@	libhawk-math.la libhawk-str.la \ | ||||
| @ENABLE_STATIC_MODULE_FALSE@	libhawk-sys.la | ||||
| subdir = lib | ||||
| @ -165,7 +163,8 @@ am__uninstall_files_from_dir = { \ | ||||
| am__installdirs = "$(DESTDIR)$(pkglibdir)" \ | ||||
| 	"$(DESTDIR)$(pkgincludedir)" | ||||
| LTLIBRARIES = $(pkglib_LTLIBRARIES) | ||||
| am__DEPENDENCIES_1 = | ||||
| @ENABLE_STATIC_MODULE_FALSE@libhawk_hawk_la_DEPENDENCIES =  \ | ||||
| @ENABLE_STATIC_MODULE_FALSE@	$(LIBADD_MOD_COMMON) | ||||
| am__libhawk_hawk_la_SOURCES_DIST = mod-hawk.c mod-hawk.h | ||||
| @ENABLE_STATIC_MODULE_FALSE@am_libhawk_hawk_la_OBJECTS =  \ | ||||
| @ENABLE_STATIC_MODULE_FALSE@	libhawk_hawk_la-mod-hawk.lo | ||||
| @ -180,6 +179,10 @@ libhawk_hawk_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ | ||||
| 	$(LDFLAGS) -o $@ | ||||
| @ENABLE_STATIC_MODULE_FALSE@am_libhawk_hawk_la_rpath = -rpath \ | ||||
| @ENABLE_STATIC_MODULE_FALSE@	$(pkglibdir) | ||||
| am__DEPENDENCIES_1 = | ||||
| @ENABLE_STATIC_MODULE_FALSE@libhawk_math_la_DEPENDENCIES =  \ | ||||
| @ENABLE_STATIC_MODULE_FALSE@	$(LIBADD_MOD_COMMON) \ | ||||
| @ENABLE_STATIC_MODULE_FALSE@	$(am__DEPENDENCIES_1) | ||||
| am__libhawk_math_la_SOURCES_DIST = mod-math.c mod-math.h | ||||
| @ENABLE_STATIC_MODULE_FALSE@am_libhawk_math_la_OBJECTS =  \ | ||||
| @ENABLE_STATIC_MODULE_FALSE@	libhawk_math_la-mod-math.lo | ||||
| @ -190,6 +193,8 @@ libhawk_math_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ | ||||
| 	$(LDFLAGS) -o $@ | ||||
| @ENABLE_STATIC_MODULE_FALSE@am_libhawk_math_la_rpath = -rpath \ | ||||
| @ENABLE_STATIC_MODULE_FALSE@	$(pkglibdir) | ||||
| @ENABLE_STATIC_MODULE_FALSE@libhawk_str_la_DEPENDENCIES =  \ | ||||
| @ENABLE_STATIC_MODULE_FALSE@	$(LIBADD_MOD_COMMON) | ||||
| am__libhawk_str_la_SOURCES_DIST = mod-str.c mod-str.h | ||||
| @ENABLE_STATIC_MODULE_FALSE@am_libhawk_str_la_OBJECTS =  \ | ||||
| @ENABLE_STATIC_MODULE_FALSE@	libhawk_str_la-mod-str.lo | ||||
| @ -200,6 +205,9 @@ libhawk_str_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ | ||||
| 	$(LDFLAGS) -o $@ | ||||
| @ENABLE_STATIC_MODULE_FALSE@am_libhawk_str_la_rpath = -rpath \ | ||||
| @ENABLE_STATIC_MODULE_FALSE@	$(pkglibdir) | ||||
| @ENABLE_STATIC_MODULE_FALSE@libhawk_sys_la_DEPENDENCIES =  \ | ||||
| @ENABLE_STATIC_MODULE_FALSE@	$(LIBADD_MOD_COMMON) \ | ||||
| @ENABLE_STATIC_MODULE_FALSE@	$(am__DEPENDENCIES_1) | ||||
| am__libhawk_sys_la_SOURCES_DIST = mod-sys.c mod-sys.h | ||||
| @ENABLE_STATIC_MODULE_FALSE@am_libhawk_sys_la_OBJECTS =  \ | ||||
| @ENABLE_STATIC_MODULE_FALSE@	libhawk_sys_la-mod-sys.lo | ||||
| @ -214,6 +222,10 @@ libhawk_sys_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ | ||||
| @ENABLE_LIBLTDL_FALSE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1) | ||||
| @ENABLE_LIBUNWIND_TRUE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1) | ||||
| @ENABLE_STATIC_MODULE_TRUE@am__DEPENDENCIES_5 = $(am__DEPENDENCIES_1) | ||||
| libhawk_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ | ||||
| 	$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \ | ||||
| 	$(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) $(am__append_11) \ | ||||
| 	$(am__append_12) | ||||
| am__libhawk_la_SOURCES_DIST = hawk.h hawk-arr.h hawk-chr.h hawk-cmn.h \ | ||||
| 	hawk-dir.h hawk-ecs.h hawk-fmt.h hawk-gem.h hawk-htb.h \ | ||||
| 	hawk-map.h hawk-rbt.h hawk-pack1.h hawk-utl.h hawk-std.h \ | ||||
| @ -586,7 +598,7 @@ pkginclude_HEADERS = hawk.h hawk-arr.h hawk-chr.h hawk-cmn.h \ | ||||
| 	hawk-dir.h hawk-ecs.h hawk-fmt.h hawk-gem.h hawk-htb.h \ | ||||
| 	hawk-map.h hawk-rbt.h hawk-pack1.h hawk-utl.h hawk-std.h \ | ||||
| 	hawk-tre.h hawk-unpack.h hawk-xma.h $(am__append_7) | ||||
| pkglib_LTLIBRARIES = libhawk.la $(am__append_15) | ||||
| pkglib_LTLIBRARIES = libhawk.la $(am__append_13) | ||||
| libhawk_la_SOURCES = $(pkginclude_HEADERS) arr.c chr.c dir.c ecs-imp.h \ | ||||
| 	ecs.c err-prv.h err.c err-sys.c fmt-imp.h fmt.c fnc-prv.h \ | ||||
| 	fnc.c htb.c gem.c gem-skad.c gem-nwif.c gem-nwif2.c hawk-prv.h \ | ||||
| @ -608,8 +620,7 @@ libhawk_la_CXXFLAGS = $(CXXFLAGS_ALL_COMMON) | ||||
| libhawk_la_LDFLAGS = $(LDFLAGS_ALL_COMMON) -version-info 1:0:0 -no-undefined | ||||
| libhawk_la_LIBADD = $(LIBM) $(SOCKET_LIBS) $(am__append_4) \ | ||||
| 	$(am__append_5) $(am__append_6) $(am__append_10) \ | ||||
| 	$(am__append_11) $(am__append_13) | ||||
| libhawk_la_DEPENDENCIES = $(am__append_12) $(am__append_14) | ||||
| 	$(am__append_11) $(am__append_12) | ||||
| @ENABLE_CXX_FALSE@libhawk_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ | ||||
| @ENABLE_CXX_FALSE@	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) \ | ||||
| @ENABLE_CXX_FALSE@	$(CFLAGS) $(libhawk_la_LDFLAGS) $(LDFLAGS) -o $@ | ||||
| @ -628,36 +639,31 @@ libhawk_la_DEPENDENCIES = $(am__append_12) $(am__append_14) | ||||
| @ENABLE_STATIC_MODULE_FALSE@CFLAGS_MOD_COMMON = $(CFLAGS_ALL_COMMON) | ||||
| @ENABLE_STATIC_MODULE_FALSE@CXXFLAGS_MOD_COMMON = $(CXXFLAGS_ALL_COMMON) | ||||
| @ENABLE_STATIC_MODULE_FALSE@LDFLAGS_MOD_COMMON = $(LDFLAGS_ALL_COMMON) | ||||
| @ENABLE_STATIC_MODULE_FALSE@LIBADD_MOD_COMMON = -lhawk | ||||
| @ENABLE_STATIC_MODULE_FALSE@DEPENDENCIES_MOD_COMMON = libhawk.la | ||||
| @ENABLE_STATIC_MODULE_FALSE@LIBADD_MOD_COMMON = libhawk.la | ||||
| @ENABLE_STATIC_MODULE_FALSE@libhawk_hawk_la_SOURCES = mod-hawk.c mod-hawk.h | ||||
| @ENABLE_STATIC_MODULE_FALSE@libhawk_hawk_la_CPPFLAGS = $(CPPFLAGS_MOD_COMMON) | ||||
| @ENABLE_STATIC_MODULE_FALSE@libhawk_hawk_la_CFLAGS = $(CFLAGS_MOD_COMMON) | ||||
| @ENABLE_STATIC_MODULE_FALSE@libhawk_hawk_la_CXXFLAGS = $(CXXFLAGS_MOD_COMMON) | ||||
| @ENABLE_STATIC_MODULE_FALSE@libhawk_hawk_la_LDFLAGS = $(LDFLAGS_MOD_COMMON) | ||||
| @ENABLE_STATIC_MODULE_FALSE@libhawk_hawk_la_LIBADD = $(LIBADD_MOD_COMMON) | ||||
| @ENABLE_STATIC_MODULE_FALSE@libhawk_hawk_la_DEPENDENCIES = $(DEPENDENCIES_MOD_COMMON) | ||||
| @ENABLE_STATIC_MODULE_FALSE@libhawk_math_la_SOURCES = mod-math.c mod-math.h | ||||
| @ENABLE_STATIC_MODULE_FALSE@libhawk_math_la_CPPFLAGS = $(CPPFLAGS_MOD_COMMON) | ||||
| @ENABLE_STATIC_MODULE_FALSE@libhawk_math_la_CFLAGS = $(CFLAGS_MOD_COMMON) | ||||
| @ENABLE_STATIC_MODULE_FALSE@libhawk_math_la_CXXFLAGS = $(CXXFLAGS_MOD_COMMON) | ||||
| @ENABLE_STATIC_MODULE_FALSE@libhawk_math_la_LDFLAGS = $(LDFLAGS_MOD_COMMON) | ||||
| @ENABLE_STATIC_MODULE_FALSE@libhawk_math_la_LIBADD = $(LIBADD_MOD_COMMON) $(LIBM) | ||||
| @ENABLE_STATIC_MODULE_FALSE@libhawk_math_la_DEPENDENCIES = $(DEPENDENCIES_MOD_COMMON) | ||||
| @ENABLE_STATIC_MODULE_FALSE@libhawk_str_la_SOURCES = mod-str.c mod-str.h | ||||
| @ENABLE_STATIC_MODULE_FALSE@libhawk_str_la_CPPFLAGS = $(CPPFLAGS_MOD_COMMON) | ||||
| @ENABLE_STATIC_MODULE_FALSE@libhawk_str_la_CFLAGS = $(CFLAGS_MOD_COMMON) | ||||
| @ENABLE_STATIC_MODULE_FALSE@libhawk_str_la_CXXFLAGS = $(CXXFLAGS_MOD_COMMON) | ||||
| @ENABLE_STATIC_MODULE_FALSE@libhawk_str_la_LDFLAGS = $(LDFLAGS_MOD_COMMON) | ||||
| @ENABLE_STATIC_MODULE_FALSE@libhawk_str_la_LIBADD = $(LIBADD_MOD_COMMON) | ||||
| @ENABLE_STATIC_MODULE_FALSE@libhawk_str_la_DEPENDENCIES = $(DEPENDENCIES_MOD_COMMON) | ||||
| @ENABLE_STATIC_MODULE_FALSE@libhawk_sys_la_SOURCES = mod-sys.c mod-sys.h | ||||
| @ENABLE_STATIC_MODULE_FALSE@libhawk_sys_la_CPPFLAGS = $(CPPFLAGS_MOD_COMMON) | ||||
| @ENABLE_STATIC_MODULE_FALSE@libhawk_sys_la_CFLAGS = $(CFLAGS_MOD_COMMON) | ||||
| @ENABLE_STATIC_MODULE_FALSE@libhawk_sys_la_CXXFLAGS = $(CXXFLAGS_MOD_COMMON) | ||||
| @ENABLE_STATIC_MODULE_FALSE@libhawk_sys_la_LDFLAGS = $(LDFLAGS_MOD_COMMON) | ||||
| @ENABLE_STATIC_MODULE_FALSE@libhawk_sys_la_LIBADD = $(LIBADD_MOD_COMMON) $(SOCKET_LIBS) | ||||
| @ENABLE_STATIC_MODULE_FALSE@libhawk_sys_la_DEPENDENCIES = $(DEPENDENCIES_MOD_COMMON) | ||||
| all: hawk-cfg.h | ||||
| 	$(MAKE) $(AM_MAKEFLAGS) all-am | ||||
|  | ||||
|  | ||||
| @ -10,8 +10,7 @@ CPPFLAGS_COMMON = \ | ||||
| CFLAGS_COMMON = | ||||
| CXXFLAGS_COMMON = | ||||
| LDFLAGS_COMMON = -L$(abs_builddir)/../lib -L$(libdir) | ||||
| LIBADD_COMMON = -lhawk  | ||||
| DEPENDENCIES_COMMON = ../lib/libhawk.la | ||||
| LIBADD_COMMON = ../lib/libhawk.la | ||||
|  | ||||
| bin_PROGRAMS =  | ||||
|  | ||||
| @ -24,7 +23,6 @@ hawk02_CPPFLAGS = $(CPPFLAGS_COMMON) | ||||
| hawk02_CFLAGS = $(CFLAGS_COMMON) | ||||
| hawk02_LDFLAGS = $(LDFLAGS_COMMON) | ||||
| hawk02_LDADD = $(LIBADD_COMMON) $(LIBM) | ||||
| hawk02_DEPENDENCIES = $(DEPENDENCIES_COMON) | ||||
|  | ||||
| hawk51_SOURCES = hawk51.cpp | ||||
| hawk51_CPPFLAGS = $(CPPFLAGS_COMMON) | ||||
| @ -32,6 +30,5 @@ hawk51_CFLAGS = $(CFLAGS_COMMON) | ||||
| hawk51_CXXFLAGS = $(CXXFLAGS_COMMON) | ||||
| hawk51_LDFLAGS = $(LDFLAGS_COMMON) | ||||
| hawk51_LDADD = $(LIBADD_COMMON) | ||||
| hawk51_DEPENDENCIES = $(DEPENDENCIES_COMMON) | ||||
|  | ||||
| endif | ||||
|  | ||||
| @ -115,6 +115,8 @@ am__hawk02_SOURCES_DIST = hawk02.c | ||||
| @ENABLE_CXX_TRUE@am_hawk02_OBJECTS = hawk02-hawk02.$(OBJEXT) | ||||
| hawk02_OBJECTS = $(am_hawk02_OBJECTS) | ||||
| am__DEPENDENCIES_1 = | ||||
| @ENABLE_CXX_TRUE@hawk02_DEPENDENCIES = $(LIBADD_COMMON) \ | ||||
| @ENABLE_CXX_TRUE@	$(am__DEPENDENCIES_1) | ||||
| AM_V_lt = $(am__v_lt_@AM_V@) | ||||
| am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) | ||||
| am__v_lt_0 = --silent | ||||
| @ -125,6 +127,7 @@ hawk02_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ | ||||
| am__hawk51_SOURCES_DIST = hawk51.cpp | ||||
| @ENABLE_CXX_TRUE@am_hawk51_OBJECTS = hawk51-hawk51.$(OBJEXT) | ||||
| hawk51_OBJECTS = $(am_hawk51_OBJECTS) | ||||
| @ENABLE_CXX_TRUE@hawk51_DEPENDENCIES = $(LIBADD_COMMON) | ||||
| hawk51_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ | ||||
| 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(hawk51_CXXFLAGS) \ | ||||
| 	$(CXXFLAGS) $(hawk51_LDFLAGS) $(LDFLAGS) -o $@ | ||||
| @ -370,21 +373,18 @@ CPPFLAGS_COMMON = \ | ||||
| CFLAGS_COMMON =  | ||||
| CXXFLAGS_COMMON =  | ||||
| LDFLAGS_COMMON = -L$(abs_builddir)/../lib -L$(libdir) | ||||
| LIBADD_COMMON = -lhawk  | ||||
| DEPENDENCIES_COMMON = ../lib/libhawk.la | ||||
| LIBADD_COMMON = ../lib/libhawk.la | ||||
| @ENABLE_CXX_TRUE@hawk02_SOURCES = hawk02.c | ||||
| @ENABLE_CXX_TRUE@hawk02_CPPFLAGS = $(CPPFLAGS_COMMON) | ||||
| @ENABLE_CXX_TRUE@hawk02_CFLAGS = $(CFLAGS_COMMON) | ||||
| @ENABLE_CXX_TRUE@hawk02_LDFLAGS = $(LDFLAGS_COMMON) | ||||
| @ENABLE_CXX_TRUE@hawk02_LDADD = $(LIBADD_COMMON) $(LIBM) | ||||
| @ENABLE_CXX_TRUE@hawk02_DEPENDENCIES = $(DEPENDENCIES_COMON) | ||||
| @ENABLE_CXX_TRUE@hawk51_SOURCES = hawk51.cpp | ||||
| @ENABLE_CXX_TRUE@hawk51_CPPFLAGS = $(CPPFLAGS_COMMON) | ||||
| @ENABLE_CXX_TRUE@hawk51_CFLAGS = $(CFLAGS_COMMON) | ||||
| @ENABLE_CXX_TRUE@hawk51_CXXFLAGS = $(CXXFLAGS_COMMON) | ||||
| @ENABLE_CXX_TRUE@hawk51_LDFLAGS = $(LDFLAGS_COMMON) | ||||
| @ENABLE_CXX_TRUE@hawk51_LDADD = $(LIBADD_COMMON) | ||||
| @ENABLE_CXX_TRUE@hawk51_DEPENDENCIES = $(DEPENDENCIES_COMMON) | ||||
| all: all-am | ||||
|  | ||||
| .SUFFIXES: | ||||
|  | ||||
| @ -11,8 +11,7 @@ LDFLAGS_COMMON=-L$(abs_builddir)/../lib  -L$(libdir) | ||||
| ## place $(LIBM)  here as all programs below are C only programs linked | ||||
| ## against the C/C++ hybrid library. Read comments in ../bin/Makefile.am | ||||
| ## for more information. | ||||
| LIBADD_COMMON = -lhawk $(LIBM) | ||||
| DEPENDENCIES_COMMON = ../lib/libhawk.la | ||||
| LIBADD_COMMON = ../lib/libhawk.la $(LIBM) | ||||
|  | ||||
| check_SCRIPTS = h-001.hawk h-002.hawk | ||||
| ##noinst_SCRIPTS = $(check_SCRIPTS) | ||||
| @ -28,35 +27,30 @@ t_002_CPPFLAGS = $(CPPFLAGS_COMMON) | ||||
| t_002_CFLAGS = $(CFLAGS_COMMON) | ||||
| t_002_LDFLAGS = $(LDFLAGS_COMMON) | ||||
| t_002_LDADD = $(LIBADD_COMMON) | ||||
| t_002_DEPENDENCIES = $(DEPENDENCIES_COMMON) | ||||
|  | ||||
| t_003_SOURCES = t-003.c t.h | ||||
| t_003_CPPFLAGS = $(CPPFLAGS_COMMON) | ||||
| t_003_CFLAGS = $(CFLAGS_COMMON) | ||||
| t_003_LDFLAGS = $(LDFLAGS_COMMON) | ||||
| t_003_LDADD = $(LIBADD_COMMON) | ||||
| t_003_DEPENDENCIES = $(DEPENDENCIES_COMMON) | ||||
|  | ||||
| t_004_SOURCES = t-004.c t.h | ||||
| t_004_CPPFLAGS = $(CPPFLAGS_COMMON) | ||||
| t_004_CFLAGS = $(CFLAGS_COMMON) | ||||
| t_004_LDFLAGS = $(LDFLAGS_COMMON) | ||||
| t_004_LDADD = $(LIBADD_COMMON) | ||||
| t_004_DEPENDENCIES = $(DEPENDENCIES_COMMON) | ||||
|  | ||||
| t_005_SOURCES = t-005.c t.h | ||||
| t_005_CPPFLAGS = $(CPPFLAGS_COMMON) | ||||
| t_005_CFLAGS = $(CFLAGS_COMMON) | ||||
| t_005_LDFLAGS = $(LDFLAGS_COMMON) | ||||
| t_005_LDADD = $(LIBADD_COMMON) | ||||
| t_005_DEPENDENCIES = $(DEPENDENCIES_COMMON) | ||||
|  | ||||
| t_006_SOURCES = t-006.c t.h | ||||
| t_006_CPPFLAGS = $(CPPFLAGS_COMMON) | ||||
| t_006_CFLAGS = $(CFLAGS_COMMON) | ||||
| t_006_LDFLAGS = $(LDFLAGS_COMMON) | ||||
| t_006_LDADD = $(LIBADD_COMMON) | ||||
| t_006_DEPENDENCIES = $(DEPENDENCIES_COMMON) | ||||
|  | ||||
|  | ||||
| TESTS = $(check_PROGRAMS) $(check_SCRIPTS) | ||||
|  | ||||
| @ -117,27 +117,32 @@ am__v_lt_1 = | ||||
| am_t_002_OBJECTS = t_002-t-002.$(OBJEXT) | ||||
| t_002_OBJECTS = $(am_t_002_OBJECTS) | ||||
| am__DEPENDENCIES_1 = | ||||
| am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) | ||||
| am__DEPENDENCIES_2 = ../lib/libhawk.la $(am__DEPENDENCIES_1) | ||||
| t_002_DEPENDENCIES = $(am__DEPENDENCIES_2) | ||||
| t_002_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ | ||||
| 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(t_002_CFLAGS) $(CFLAGS) \ | ||||
| 	$(t_002_LDFLAGS) $(LDFLAGS) -o $@ | ||||
| am_t_003_OBJECTS = t_003-t-003.$(OBJEXT) | ||||
| t_003_OBJECTS = $(am_t_003_OBJECTS) | ||||
| t_003_DEPENDENCIES = $(am__DEPENDENCIES_2) | ||||
| t_003_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ | ||||
| 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(t_003_CFLAGS) $(CFLAGS) \ | ||||
| 	$(t_003_LDFLAGS) $(LDFLAGS) -o $@ | ||||
| am_t_004_OBJECTS = t_004-t-004.$(OBJEXT) | ||||
| t_004_OBJECTS = $(am_t_004_OBJECTS) | ||||
| t_004_DEPENDENCIES = $(am__DEPENDENCIES_2) | ||||
| t_004_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ | ||||
| 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(t_004_CFLAGS) $(CFLAGS) \ | ||||
| 	$(t_004_LDFLAGS) $(LDFLAGS) -o $@ | ||||
| am_t_005_OBJECTS = t_005-t-005.$(OBJEXT) | ||||
| t_005_OBJECTS = $(am_t_005_OBJECTS) | ||||
| t_005_DEPENDENCIES = $(am__DEPENDENCIES_2) | ||||
| t_005_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ | ||||
| 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(t_005_CFLAGS) $(CFLAGS) \ | ||||
| 	$(t_005_LDFLAGS) $(LDFLAGS) -o $@ | ||||
| am_t_006_OBJECTS = t_006-t-006.$(OBJEXT) | ||||
| t_006_OBJECTS = $(am_t_006_OBJECTS) | ||||
| t_006_DEPENDENCIES = $(am__DEPENDENCIES_2) | ||||
| t_006_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ | ||||
| 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(t_006_CFLAGS) $(CFLAGS) \ | ||||
| 	$(t_006_LDFLAGS) $(LDFLAGS) -o $@ | ||||
| @ -572,8 +577,7 @@ CPPFLAGS_COMMON = \ | ||||
|  | ||||
| CFLAGS_COMMON =  | ||||
| LDFLAGS_COMMON = -L$(abs_builddir)/../lib  -L$(libdir) | ||||
| LIBADD_COMMON = -lhawk $(LIBM) | ||||
| DEPENDENCIES_COMMON = ../lib/libhawk.la | ||||
| LIBADD_COMMON = ../lib/libhawk.la $(LIBM) | ||||
| check_SCRIPTS = h-001.hawk h-002.hawk | ||||
| EXTRA_DIST = $(check_SCRIPTS) ensure.inc | ||||
| t_001_SOURCES = t-001.c t.h | ||||
| @ -583,31 +587,26 @@ t_002_CPPFLAGS = $(CPPFLAGS_COMMON) | ||||
| t_002_CFLAGS = $(CFLAGS_COMMON) | ||||
| t_002_LDFLAGS = $(LDFLAGS_COMMON) | ||||
| t_002_LDADD = $(LIBADD_COMMON) | ||||
| t_002_DEPENDENCIES = $(DEPENDENCIES_COMMON) | ||||
| t_003_SOURCES = t-003.c t.h | ||||
| t_003_CPPFLAGS = $(CPPFLAGS_COMMON) | ||||
| t_003_CFLAGS = $(CFLAGS_COMMON) | ||||
| t_003_LDFLAGS = $(LDFLAGS_COMMON) | ||||
| t_003_LDADD = $(LIBADD_COMMON) | ||||
| t_003_DEPENDENCIES = $(DEPENDENCIES_COMMON) | ||||
| t_004_SOURCES = t-004.c t.h | ||||
| t_004_CPPFLAGS = $(CPPFLAGS_COMMON) | ||||
| t_004_CFLAGS = $(CFLAGS_COMMON) | ||||
| t_004_LDFLAGS = $(LDFLAGS_COMMON) | ||||
| t_004_LDADD = $(LIBADD_COMMON) | ||||
| t_004_DEPENDENCIES = $(DEPENDENCIES_COMMON) | ||||
| t_005_SOURCES = t-005.c t.h | ||||
| t_005_CPPFLAGS = $(CPPFLAGS_COMMON) | ||||
| t_005_CFLAGS = $(CFLAGS_COMMON) | ||||
| t_005_LDFLAGS = $(LDFLAGS_COMMON) | ||||
| t_005_LDADD = $(LIBADD_COMMON) | ||||
| t_005_DEPENDENCIES = $(DEPENDENCIES_COMMON) | ||||
| t_006_SOURCES = t-006.c t.h | ||||
| t_006_CPPFLAGS = $(CPPFLAGS_COMMON) | ||||
| t_006_CFLAGS = $(CFLAGS_COMMON) | ||||
| t_006_LDFLAGS = $(LDFLAGS_COMMON) | ||||
| t_006_LDADD = $(LIBADD_COMMON) | ||||
| t_006_DEPENDENCIES = $(DEPENDENCIES_COMMON) | ||||
| TESTS = $(check_PROGRAMS) $(check_SCRIPTS) | ||||
| TEST_EXTENSIONS = .hawk | ||||
| HAWK_LOG_COMPILER = ../bin/hawk | ||||
|  | ||||
| @ -9,7 +9,6 @@ CPPFLAGS_COMMON = \ | ||||
| CFLAGS_COMMON =  | ||||
| LDFLAGS_COMMON = -L$(abs_builddir)/../lib -L$(libdir)  | ||||
| LIBADD_COMMON =  | ||||
| DEPENDENCIES_COMMON =  | ||||
|  | ||||
| bin_PROGRAMS = uni-case uni-prop | ||||
|  | ||||
| @ -18,11 +17,9 @@ uni_case_CPPFLAGS = $(CPPFLAGS_COMMON) | ||||
| uni_case_CFLAGS = $(CFLAGS_COMMON) | ||||
| uni_case_LDFLAGS = $(LDFLAGS_COMMON) | ||||
| uni_case_LDADD = $(LIBADD_COMMON)  | ||||
| uni_case_DEPENDENCIES = $(DEPENDENCIES_COMMON) | ||||
|  | ||||
| uni_prop_SOURCES = uni-prop.c | ||||
| uni_prop_CPPFLAGS = $(CPPFLAGS_COMMON) | ||||
| uni_prop_CFLAGS = $(CFLAGS_COMMON) | ||||
| uni_prop_LDFLAGS = $(LDFLAGS_COMMON) | ||||
| uni_prop_LDADD = $(LIBADD_COMMON)  | ||||
| uni_prop_DEPENDENCIES = $(DEPENDENCIES_COMMON) | ||||
|  | ||||
| @ -112,6 +112,7 @@ PROGRAMS = $(bin_PROGRAMS) | ||||
| am_uni_case_OBJECTS = uni_case-uni-case.$(OBJEXT) | ||||
| uni_case_OBJECTS = $(am_uni_case_OBJECTS) | ||||
| am__DEPENDENCIES_1 = | ||||
| uni_case_DEPENDENCIES = $(am__DEPENDENCIES_1) | ||||
| AM_V_lt = $(am__v_lt_@AM_V@) | ||||
| am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) | ||||
| am__v_lt_0 = --silent | ||||
| @ -121,6 +122,7 @@ uni_case_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ | ||||
| 	$(CFLAGS) $(uni_case_LDFLAGS) $(LDFLAGS) -o $@ | ||||
| am_uni_prop_OBJECTS = uni_prop-uni-prop.$(OBJEXT) | ||||
| uni_prop_OBJECTS = $(am_uni_prop_OBJECTS) | ||||
| uni_prop_DEPENDENCIES = $(am__DEPENDENCIES_1) | ||||
| uni_prop_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ | ||||
| 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(uni_prop_CFLAGS) \ | ||||
| 	$(CFLAGS) $(uni_prop_LDFLAGS) $(LDFLAGS) -o $@ | ||||
| @ -348,19 +350,16 @@ CPPFLAGS_COMMON = \ | ||||
| CFLAGS_COMMON =  | ||||
| LDFLAGS_COMMON = -L$(abs_builddir)/../lib -L$(libdir)  | ||||
| LIBADD_COMMON =  | ||||
| DEPENDENCIES_COMMON =  | ||||
| uni_case_SOURCES = uni-case.c | ||||
| uni_case_CPPFLAGS = $(CPPFLAGS_COMMON) | ||||
| uni_case_CFLAGS = $(CFLAGS_COMMON) | ||||
| uni_case_LDFLAGS = $(LDFLAGS_COMMON) | ||||
| uni_case_LDADD = $(LIBADD_COMMON)  | ||||
| uni_case_DEPENDENCIES = $(DEPENDENCIES_COMMON) | ||||
| uni_prop_SOURCES = uni-prop.c | ||||
| uni_prop_CPPFLAGS = $(CPPFLAGS_COMMON) | ||||
| uni_prop_CFLAGS = $(CFLAGS_COMMON) | ||||
| uni_prop_LDFLAGS = $(LDFLAGS_COMMON) | ||||
| uni_prop_LDADD = $(LIBADD_COMMON)  | ||||
| uni_prop_DEPENDENCIES = $(DEPENDENCIES_COMMON) | ||||
| all: all-am | ||||
|  | ||||
| .SUFFIXES: | ||||
|  | ||||
		Reference in New Issue
	
	Block a user