UGH... while trying to fix #10995, I found all kinds of cruft in this Makefile. It should all be gone now, and as a side effect hashtest2 now builds with --enable-dev-mode enabled without a host of errors

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@87498 f38db490-d61c-443f-a65b-d21fe96a405b

2 files changed, 22 insertions, 39 deletions

diff --git a/utils/Makefile b/utils/Makefile
index 2cbf1b4c9..121ac38a2 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -96,51 +96,45 @@ ast_expr2f.o: ASTCFLAGS+=-DSTANDALONE_AEL -I../main
 
 pval.o : ASTCFLAGS+=-DSTANDALONE
 
-check_expr: check_expr.o ast_expr2.o ast_expr2f.o strcompat.o clicompat.o ../main/threadstorage.o
+check_expr: check_expr.o ast_expr2.o ast_expr2f.o strcompat.o clicompat.o threadstorage.o
 
 aelbison.c: ../res/ael/ael.tab.c
 	@cp $< $@
-aelbison.o: aelbison.c ../res/ael/ael.tab.h ../include/asterisk/ael_structs.h
+
 aelbison.o: ASTCFLAGS+=-I../res/ael  -DYYENABLE_NLS=0
 
 pbx_ael.c: ../pbx/pbx_ael.c
 	@cp $< $@
-pbx_ael.o: ASTCFLAGS+=-DSTANDALONE_AEL
 
-ael_main.o: ael_main.c ../include/asterisk/ael_structs.h
+pbx_ael.o: ASTCFLAGS+=-DSTANDALONE_AEL
 
 aelparse.c: ../res/ael/ael_lex.c
 	@cp $< $@
-aelparse.o: aelparse.c ../include/asterisk/ael_structs.h ../res/ael/ael.tab.h
+
 aelparse.o: ASTCFLAGS+=-I../res -DSTANDALONE_AEL
 
 aelparse: aelparse.o aelbison.o pbx_ael.o ael_main.o ast_expr2f.o ast_expr2.o strcompat.o pval.o extconf.o
 
-astobj2.c : ../main/astobj2.c  ../include/asterisk/astobj2.h
-	cp ../main/astobj2.c .
-
-utils.c : ../main/utils.c
-	cp ../main/utils.c .
+astobj2.c: ../main/astobj2.c
+	@cp $< $@
 
-sha1.c : ../main/sha1.c
-	cp ../main/sha1.c .
+utils.c: ../main/utils.c
+	@cp $< $@
 
-sha1.o : sha1.c
-utils.o : utils.c
+sha1.c: ../main/sha1.c
+	@cp $< $@
 
-astobj2.o : astobj2.c
+threadstorage.c: ../main/threadstorage.c
+	@cp $< $@
 
-hashtest2.o : hashtest2.c
-	$(CC) -g -O0 -c hashtest2.c $(PTHREAD_CFLAGS) -I/usr/include -I../include
+hashtest2.o: ASTCFLAGS+=-O0
 
-hashtest2 : hashtest2.o md5.o utils.o astobj2.o sha1.o strcompat.o ../main/threadstorage.o clicompat.o
-	$(CC) -g -O0 -o hashtest2 hashtest2.o astobj2.o utils.o md5.o sha1.o strcompat.o ../main/threadstorage.o clicompat.o $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) $(LIBS)
+hashtest2: hashtest2.o md5.o utils.o astobj2.o sha1.o strcompat.o threadstorage.o clicompat.o
 
 extconf.o : extconf.c
 
 conf2ael: conf2ael.o ast_expr2f.o ast_expr2.o aelbison.o aelparse.o pbx_ael.o pval.o extconf.o strcompat.o
 
-
 testexpr2s: ../main/ast_expr2f.c ../main/ast_expr2.c ../main/ast_expr2.h
 	$(CC) -g -c -I../include -DSTANDALONE_AEL ../main/ast_expr2f.c -o ast_expr2f.o
 	$(CC) -g -c -I../include -DSTANDALONE_AEL ../main/ast_expr2.c -o ast_expr2.o
diff --git a/utils/hashtest2.c b/utils/hashtest2.c
index 7e10cb70c..aaaeb06a3 100644
--- a/utils/hashtest2.c
+++ b/utils/hashtest2.c
@@ -59,6 +59,7 @@ int testno = 2;
 
 int64_t ast_mark(int prof_id, int x)
 {
+	return 0;
 }
 
 /* my OBJECT */
@@ -71,7 +72,7 @@ struct ht_element
 
 static int hash_string(const void *obj, const int flags)
 {
-	unsigned char *str = ((struct ht_element*)obj)->key;
+	char *str = ((struct ht_element*)obj)->key;
 	int total;
 
 	for (total=0; *str; str++)
@@ -97,7 +98,7 @@ static int hashtab_compare_strings(void *a, void *b, int flags)
 
 /* random numbers */
 
-my_rand(int incl_low, int incl_high, unsigned int *seedp)
+static int my_rand(int incl_low, int incl_high, unsigned int *seedp)
 {
 	if (incl_high == 0)
 		return 0;
@@ -121,7 +122,7 @@ int els_traversals = 0;
 
 /* all the operations to perform on the hashtab */
 
-void ht_destroy(void *obj)
+static void ht_destroy(void *obj)
 {
 	const struct ht_element *o = obj;
 	if (o->key)
@@ -219,13 +220,13 @@ static void *hashtest(void *data)
 	int my_els_found = 0;
 	int my_els_traversals = 0;
 	int my_testno = testno++;
+	int its;
 	
 	/* data will be a random number == use as a seed for random numbers */
 	unsigned long seed = (unsigned long)data;
 	printf("hashtest thread created... test beginning\n");
 	
 	/* main test routine-- a global hashtab exists, pound it like crazy  */
-	int its;
 	for(its=0;its<100000;its++)
 	{
 		void *seed2 = &seed;
@@ -269,7 +270,7 @@ static void *hashtest(void *data)
 	pthread_exit(0);
 }
 
-void run_hashtest(int numthr)
+static void run_hashtest(int numthr)
 {
 	pthread_t thr[numthr];
 	void *thrres[numthr];
@@ -321,13 +322,9 @@ int main(int argc,char **argv)
 }
 
 
-struct ast_app *pbx_findapp(const char *app)
-{
-	return (struct ast_app*)1; /* so as not to trigger an error */
-}
-
-int  ast_add_profile(const char *x, uint64_t scale)
+int ast_add_profile(const char *x, uint64_t scale)
 {
+	return 0;
 }
 
 int ast_loader_register(int (*updater)(void))
@@ -357,14 +354,6 @@ void ast_unregister_file_version(const char *file)
 
 }
 
-void ast_cli_unregister_multiple(void)
-{
-}
-
-void ast_context_destroy(void)
-{
-}
-
 void ast_log(int level, const char *file, int line, const char *function, const char *fmt, ...)
 {
 	va_list vars;