Changeset 29082 for main/trunk/greenstone2/common-src

Timestamp:

2014-05-29T11:23:15+12:00 (10 years ago)

Author:

kjdon

Message:

added DEP_LIBS variable to dependency lines so that if we change something in lib, then the executables will be relinked.

File:

• main/trunk/greenstone2/common-src/indexers/mg/src/text/Makefile.in (modified) (9 diffs)

main/trunk/greenstone2/common-src/indexers/mg/src/text/Makefile.in

@@ -45 +45 @@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 LDFLAGS = @LDFLAGS@
-LIBS = ../../lib/libmglib.a @LIBS@
+DEP_LIBS = ../../lib/libmglib.a
+LIBS =  $(DEP_LIBS) @LIBS@
 TOUCH = echo timestamp >
 AWK = @AWK@
@@ -178 +179 @@
 HILITE_OBJS = mg_hilite_words$o stemmer$o locallib$o words$o environment$o
 
-mg_hilite_words: $(HILITE_OBJS)
+mg_hilite_words: $(HILITE_OBJS) $(DEP_LIBS)
     $(LINK) $(HILITE_OBJS) $(LIBS)
 
@@ -191 +192 @@
         words$o environment$o
 
-bool_tester: $(BOOL_OBJS)
+bool_tester: $(BOOL_OBJS) $(DEP_LIBS)
     $(LINK) $(BOOL_OBJS) $(LIBS)
 
@@ -204 +205 @@
     query_term_list$o words$o
 
-mgquery: $(QUERY_OBJS)  
+mgquery: $(QUERY_OBJS)   $(DEP_LIBS)
     $(LINK) $(READLINE) $(QUERY_OBJS) $(READLINE_LIBS) $(LIBS)
 
@@ -217 +218 @@
     words$o environment$o
 
-mg_passes: $(PASSES_OBJS)
+mg_passes: $(PASSES_OBJS) $(DEP_LIBS)
     $(LINK) $(PASSES_OBJS) $(LIBS) 
 
@@ -224 +225 @@
 WEIGHTS_BUILD_OBJS = mg_weights_build$o mg_files$o
 
-mg_weights_build: $(WEIGHTS_BUILD_OBJS)
+mg_weights_build: $(WEIGHTS_BUILD_OBJS) $(DEP_LIBS)
     $(LINK) $(WEIGHTS_BUILD_OBJS) $(LIBS)
 
 COMP_DICT_OBJS = mg_compression_dict$o mg_files$o locallib$o
 
-mg_compression_dict: $(COMP_DICT_OBJS)
+mg_compression_dict: $(COMP_DICT_OBJS) $(DEP_LIBS)
     $(LINK) $(COMP_DICT_OBJS) $(LIBS)
 
 FAST_COMP_OBJS = mg_fast_comp_dict$o mg_files$o locallib$o
 
-mg_fast_comp_dict: $(FAST_COMP_OBJS)
+mg_fast_comp_dict: $(FAST_COMP_OBJS) $(DEP_LIBS)
     $(LINK) $(FAST_COMP_OBJS) $(LIBS)
 
 TEXT_EST_OBJS = mg_text_estimate$o locallib$o comp_dict$o mg_files$o
 
-mg_text_estimate: $(TEXT_EST_OBJS)
+mg_text_estimate: $(TEXT_EST_OBJS) $(DEP_LIBS)
     $(LINK) $(TEXT_EST_OBJS) $(LIBS)
 
 STAT_OBJS = mgstat$o mg_files$o locallib$o
 
-mgstat: $(STAT_OBJS)
+mgstat: $(STAT_OBJS) $(DEP_LIBS)
     $(LINK) $(STAT_OBJS) $(LIBS)
 
 INVF_DUMP_OBJS = mg_invf_dump$o locallib$o mg_files$o
 
-mg_invf_dump: $(INVF_DUMP_OBJS)
+mg_invf_dump: $(INVF_DUMP_OBJS) $(DEP_LIBS)
     $(LINK) $(INVF_DUMP_OBJS) $(LIBS)
 
 INVF_DICT_OBJS = mg_invf_dict$o mg_files$o locallib$o
 
-mg_invf_dict: $(INVF_DICT_OBJS)
+mg_invf_dict: $(INVF_DICT_OBJS) $(DEP_LIBS)
     $(LINK) $(INVF_DICT_OBJS) $(LIBS)
 
 INVF_REB_OBJS = mg_invf_rebuild$o locallib$o
 
-mg_invf_rebuild: $(INVF_REB_OBJS)
+mg_invf_rebuild: $(INVF_REB_OBJS) $(DEP_LIBS)
     $(LINK) $(INVF_REB_OBJS) $(LIBS)
 
 DICTLIST_OBJS = mgdictlist$o locallib$o
 
-mgdictlist: $(DICTLIST_OBJS)
+mgdictlist: $(DICTLIST_OBJS) $(DEP_LIBS)
     $(LINK) $(DICTLIST_OBJS) $(LIBS)
 
 PERF_HASH_OBJS = mg_perf_hash_build$o mg_files$o
 
-mg_perf_hash_build: $(PERF_HASH_OBJS)
+mg_perf_hash_build: $(PERF_HASH_OBJS) $(DEP_LIBS)
     $(LINK) $(PERF_HASH_OBJS) $(LIBS)
 
@@ -276 +277 @@
                 mg_errors$o term_lists$o
 
-mg_stem_idx: $(STEM_IDX_OBJS)
+mg_stem_idx: $(STEM_IDX_OBJS) $(DEP_LIBS)
     $(LINK) $(STEM_IDX_OBJS) $(LIBS)
 
 STEM_IDX_LIST_OBJS = mgstemidxlist$o mg_files$o
 
-mgstemidxlist: $(STEM_IDX_LIST_OBJS)
+mgstemidxlist: $(STEM_IDX_LIST_OBJS) $(DEP_LIBS)
     $(LINK) $(STEM_IDX_LIST_OBJS) $(LIBS)
 
@@ -289 +290 @@
                 term_lists.o stemmer.o weights.o invf_get.o lists.o
 
-mg_decompress_text: $(DECOMPRESS_TEXT_OBJS)
+mg_decompress_text: $(DECOMPRESS_TEXT_OBJS) $(DEP_LIBS)
     $(LINK) $(DECOMPRESS_TEXT_OBJS) $(LIBS)
 
@@ -296 +297 @@
 TEXT_MERGE_OBJS = mg_text_merge$o mg_files$o locallib$o
 
-mg_text_merge: $(TEXT_MERGE_OBJS)
+mg_text_merge: $(TEXT_MERGE_OBJS) $(DEP_LIBS)
     $(LINK) $(TEXT_MERGE_OBJS) $(LIBS)
 
 INVF_MERGE_OBJS = mg_invf_merge$o mg_files$o locallib$o
 
-mg_invf_merge: $(INVF_MERGE_OBJS)
+mg_invf_merge: $(INVF_MERGE_OBJS) $(DEP_LIBS)
     $(LINK) $(INVF_MERGE_OBJS) $(LIBS)