fix up build system

julius-speech · Aug 10, 2020 · 3ebd81b · 3ebd81b
1 parent 2fc3a17
commit 3ebd81b
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 31 deletions.
diff --git a/adinrec/Makefile.in b/adinrec/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (c) 1991-2013 Kawahara Lab., Kyoto University
 # Copyright (c) 2001-2005 Shikano Lab., Nara Institute of Science and Technology
 # Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology
-# All rights reserved 
+# All rights reserved
 #
 # $Id: Makefile.in,v 1.8 2013/06/20 17:14:16 sumomo Exp $
 #
@@ -17,8 +17,6 @@ CC=@CC@
 CFLAGS=@CFLAGS@
 CPPFLAGS=-I. -I$(LIBJULIUS)/include -I$(LIBSENT)/include @CPPFLAGS@ `$(LIBSENT)/libsent-config --cflags` `$(LIBJULIUS)/libjulius-config --cflags`
 LDFLAGS=@LDFLAGS@ -L$(LIBJULIUS) `$(LIBJULIUS)/libjulius-config --libs` -L$(LIBSENT) `$(LIBSENT)/libsent-config --libs`
-CCLINK=`$(LIBSENT)/libsent-config --linker`
-LINKFLAGS=`$(LIBSENT)/libsent-config --linkflags`
 RM=@RM@ -f
 prefix=@prefix@
 exec_prefix=@exec_prefix@
@@ -30,8 +28,8 @@ TARGET=adinrec@EXEEXT@
 
 all: $(TARGET)
 
-$(TARGET): adinrec.o $(LIBSENT)/libsent.a $(LIBJULIUS)/libjulius.a
-	$(CCLINK) $(LINKFLAGS) -o $@ adinrec.o $(LDFLAGS)
+$(TARGET): adinrec.c $(LIBSENT)/libsent.a $(LIBJULIUS)/libjulius.a
+	$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ adinrec.c $(LDFLAGS)
 
 ############################################################
 

diff --git a/adintool/Makefile.in b/adintool/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (c) 1991-2016 Kawahara Lab., Kyoto University
 # Copyright (c) 2001-2005 Shikano Lab., Nara Institute of Science and Technology
 # Copyright (c) 2005-2016 Julius project team, Nagoya Institute of Technology
-# All rights reserved 
+# All rights reserved
 #
 SHELL=/bin/sh
 .SUFFIXES:
@@ -17,8 +17,6 @@ CC=@CC@
 CFLAGS=@CFLAGS@
 CPPFLAGS=-I. -I$(LIBJULIUS)/include -I$(LIBSENT)/include @CPPFLAGS@ `$(LIBSENT)/libsent-config --cflags` `$(LIBJULIUS)/libjulius-config --cflags`
 LDFLAGS=@LDFLAGS@ -L$(LIBJULIUS) `$(LIBJULIUS)/libjulius-config --libs` -L$(LIBSENT) `$(LIBSENT)/libsent-config --libs`
-CCLINK=`$(LIBSENT)/libsent-config --linker`
-LINKFLAGS=`$(LIBSENT)/libsent-config --linkflags`
 RM=@RM@ -f
 prefix=@prefix@
 exec_prefix=@exec_prefix@
@@ -40,10 +38,10 @@ TARGET=adintool@EXEEXT@ $(GUITARGET)
 all: $(TARGET)
 
 adintool@EXEEXT@: $(OBJ) $(LIBSENT)/libsent.a $(LIBJULIUS)/libjulius.a
-	$(CCLINK) $(LINKFLAGS) -o $@ $(OBJ) $(LDFLAGS)
+	$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $(OBJ) $(LDFLAGS)
 
 adintool-gui@EXEEXT@: $(GUIOBJ) $(LIBSENT)/libsent.a $(LIBJULIUS)/libjulius.a
-	$(CCLINK) $(LINKFLAGS) $(SDL_CFLAGS) -o $@ $(GUIOBJ) $(LDFLAGS) $(SDL_LDFLAGS)
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(SDL_CFLAGS) -o $@ $(GUIOBJ) $(LDFLAGS) $(SDL_LDFLAGS)
 
 install: install.bin
 

diff --git a/binlm2arpa/Makefile.in b/binlm2arpa/Makefile.in
@@ -14,8 +14,6 @@ CC=@CC@
 CFLAGS=@CFLAGS@
 CPPFLAGS=-I$(LIBSENT)/include @CPPFLAGS@ @DEFS@ `$(LIBSENT)/libsent-config --cflags`
 LDFLAGS=@LDFLAGS@ -L$(LIBSENT) `$(LIBSENT)/libsent-config --libs`
-CCLINK=`$(LIBSENT)/libsent-config --linker`
-LINKFLAGS=`$(LIBSENT)/libsent-config --linkflags`
 RM=@RM@ -f
 prefix=@prefix@
 exec_prefix=@exec_prefix@
@@ -27,7 +25,7 @@ TARGET=binlm2arpa@EXEEXT@
 all: $(TARGET)
 
 $(TARGET): $(OBJ) $(LIBSENT)/libsent.a
-	$(CCLINK) $(LINKFLAGS) -o $@ $(OBJ) $(LDFLAGS)
+	$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $(OBJ) $(LDFLAGS)
 
 install: install.bin
 

diff --git a/generate-ngram/Makefile.in b/generate-ngram/Makefile.in
@@ -16,8 +16,6 @@ CC=@CC@
 CFLAGS=@CFLAGS@
 CPPFLAGS=-I$(LIBSENT)/include @CPPFLAGS@ @DEFS@ `$(LIBSENT)/libsent-config --cflags`
 LDFLAGS=@LDFLAGS@ -L$(LIBSENT) `$(LIBSENT)/libsent-config --libs`
-CCLINK=`$(LIBSENT)/libsent-config --linker`
-LINKFLAGS=`$(LIBSENT)/libsent-config --linkflags`
 RM=@RM@ -f
 prefix=@prefix@
 exec_prefix=@exec_prefix@
@@ -30,7 +28,7 @@ TARGET=generate-ngram@EXEEXT@
 all: $(TARGET)
 
 $(TARGET): $(OBJ) $(LIBSENT)/libsent.a
-	$(CCLINK) $(LINKFLAGS) -o $@ $(OBJ) $(LDFLAGS)
+	$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $(OBJ) $(LDFLAGS)
 
 install: install.bin
 

diff --git a/julius/Makefile.in b/julius/Makefile.in
@@ -18,7 +18,6 @@ LIBJULIUS=../libjulius
 CC=@CC@
 CFLAGS=@CFLAGS@
 CPPFLAGS=-I. -I$(LIBJULIUS)/include -I$(LIBSENT)/include @CPPFLAGS@ `$(LIBSENT)/libsent-config --cflags` `$(LIBJULIUS)/libjulius-config --cflags`
-LINKFLAGS=`$(LIBSENT)/libsent-config --linkflags`
 LDFLAGS=@LDFLAGS@ -L$(LIBJULIUS) `$(LIBJULIUS)/libjulius-config --libs` -L$(LIBSENT) `$(LIBSENT)/libsent-config --libs` @LIBICONV@
 GTK_CFLAGS=@GTK_CFLAGS@
 GTK_LIBS=@GTK_LIBS@

diff --git a/libsent/libsent-config-dist.in b/libsent/libsent-config-dist.in
@@ -65,7 +65,7 @@ while test $# -gt 0; do
 
     case $1 in
 	--cflags)
-	    echo $sound_inc
+	    echo -I@includedir@ $sound_inc
 	    ;;
 	--libs)
 	    echo -L@libdir@ -lsent $sound_libs @LIBS@ -lm

diff --git a/mkbingram/Makefile.in b/mkbingram/Makefile.in
@@ -14,8 +14,6 @@ CC=@CC@
 CFLAGS=@CFLAGS@
 CPPFLAGS=-I$(LIBSENT)/include @CPPFLAGS@ @DEFS@ `$(LIBSENT)/libsent-config --cflags`
 LDFLAGS=@LDFLAGS@ -L$(LIBSENT) `$(LIBSENT)/libsent-config --libs` @LIBICONV@
-CCLINK=`$(LIBSENT)/libsent-config --linker`
-LINKFLAGS=`$(LIBSENT)/libsent-config --linkflags`
 RM=@RM@ -f
 prefix=@prefix@
 exec_prefix=@exec_prefix@
@@ -27,7 +25,7 @@ TARGET=mkbingram@EXEEXT@
 all: $(TARGET)
 
 $(TARGET): $(OBJ) $(LIBSENT)/libsent.a
-	$(CCLINK) $(LINKFLAGS) -o $@ $(OBJ) $(LDFLAGS)
+	$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $(OBJ) $(LDFLAGS)
 
 install: install.bin
 

diff --git a/mkbinhmm/Makefile.in b/mkbinhmm/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (c) 2003-2013 Kawahara Lab., Kyoto University 
+# Copyright (c) 2003-2013 Kawahara Lab., Kyoto University
 # Copyright (c) 2003-2005 Shikano Lab., Nara Institute of Science and Technology
 # Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology
 # All rights reserved
@@ -16,8 +16,6 @@ CC=@CC@
 CFLAGS=@CFLAGS@
 CPPFLAGS=-I$(LIBSENT)/include @CPPFLAGS@ @DEFS@ `$(LIBSENT)/libsent-config --cflags`
 LDFLAGS=@LDFLAGS@ -L$(LIBSENT) `$(LIBSENT)/libsent-config --libs`
-CCLINK=`$(LIBSENT)/libsent-config --linker`
-LINKFLAGS=`$(LIBSENT)/libsent-config --linkflags`
 RM=@RM@ -f
 prefix=@prefix@
 exec_prefix=@exec_prefix@
@@ -26,10 +24,10 @@ INSTALL=@INSTALL@
 all: mkbinhmm@EXEEXT@ mkbinhmmlist@EXEEXT@
 
 mkbinhmm@EXEEXT@: mkbinhmm.o $(LIBSENT)/libsent.a
-	$(CCLINK) $(LINKFLAGS) -o $@ mkbinhmm.o $(LDFLAGS)
+	$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ mkbinhmm.o $(LDFLAGS)
 
 mkbinhmmlist@EXEEXT@: mkbinhmmlist.o $(LIBSENT)/libsent.a
-	$(CCLINK) $(LINKFLAGS) -o $@ mkbinhmmlist.o $(LDFLAGS)
+	$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ mkbinhmmlist.o $(LDFLAGS)
 
 install: install.bin
 

diff --git a/mkss/Makefile.in b/mkss/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (c) 1991-2013 Kawahara Lab., Kyoto University
 # Copyright (c) 2001-2005 Shikano Lab., Nara Institute of Science and Technology
 # Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology
-# All rights reserved 
+# All rights reserved
 #
 # $Id: Makefile.in,v 1.8 2013/06/20 17:14:28 sumomo Exp $
 #
@@ -17,8 +17,6 @@ CC=@CC@
 CFLAGS=@CFLAGS@
 CPPFLAGS=-I. -I$(LIBJULIUS)/include -I$(LIBSENT)/include @CPPFLAGS@ `$(LIBSENT)/libsent-config --cflags` `$(LIBJULIUS)/libjulius-config --cflags`
 LDFLAGS=@LDFLAGS@ -L$(LIBJULIUS) `$(LIBJULIUS)/libjulius-config --libs` -L$(LIBSENT) `$(LIBSENT)/libsent-config --libs`
-CCLINK=`$(LIBSENT)/libsent-config --linker`
-LINKFLAGS=`$(LIBSENT)/libsent-config --linkflags`
 RM=@RM@ -f
 prefix=@prefix@
 exec_prefix=@exec_prefix@
@@ -30,8 +28,8 @@ TARGET=mkss@EXEEXT@
 
 all: $(TARGET)
 
-$(TARGET): mkss.o $(LIBSENT)/libsent.a $(LIBJULIUS)/libjulius.a
-	$(CCLINK) $(LINKFLAGS) -o $@ mkss.o $(LDFLAGS)
+$(TARGET): mkss.c $(LIBSENT)/libsent.a $(LIBJULIUS)/libjulius.a
+	$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ mkss.c $(LDFLAGS)
 
 ############################################################