Skip to content

Commit

Permalink
drop -lfl flag
Browse files Browse the repository at this point in the history
it is not useful anymore, as long as yyparse is either provided or
%option noyyparse is used

This is the case in our code base.
  • Loading branch information
yanntm committed Mar 19, 2019
1 parent 56443b3 commit 062c8ba
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ ENABLE_Cxx14 ?= -std=c++17

# External libraries
FLEX-INCLUDE :=
FLEX-LIB := -lfl
FLEX-LIB :=

GLIB-INCLUDE := $(shell pkg-config --silence-errors --cflags glib-2.0)
GLIB-LIB := $(shell pkg-config --silence-errors --libs glib-2.0)
Expand Down Expand Up @@ -69,7 +69,7 @@ ifeq ($(UNAME_S),Darwin)
MOTIF-INCLUDE := -I/usr/OpenMotif/include
MOTIF-LIB := -L/usr/OpenMotif/lib
UIL := /usr/OpenMotif/bin/uil
FLEX-LIB := -lfl -L/usr/local/opt/flex/lib
FLEX-LIB := -L/usr/local/opt/flex/lib
OPENGL-LIB := -lgl -lglu -lglut
CC := gcc -g -c -std=c99
CPP := g++ -g -c -std=c++14 -Wno-unused-local-typedef
Expand Down
2 changes: 1 addition & 1 deletion ODE-SDE/makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

OPTION = -O3 -std=c++11 -lfl -lm
OPTION = -O3 -std=c++11 -lm
OPTIONW = -Wall

CC = gcc
Expand Down
2 changes: 1 addition & 1 deletion WN/SOURCE/DSRG/makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ INCGREAT =../../INCLUDE/
#commands
COMP = $(CC) -O3
CFLAG = -o
LFLAGS = -lgspnMCDSRG -lm -lfl -lglib-2.0
LFLAGS = -lgspnMCDSRG -lm -lglib-2.0
LIBFLAG =-L$(LIB)
#-L$(GLIB)
# -L$(FLEXLIB)
Expand Down
4 changes: 2 additions & 2 deletions WN/SOURCE/MDWN/CompilazioneRG2RRG.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

g++ -L../lib_header/ rg2rrg.cpp function.cpp -o RG2RRG -g -lgspnESRG -lm -lfl
g++ -L../lib_header/ rg2rrg.cpp function.cpp -o RG2RRG -g -lgspnESRG -lm


X cluster
g++ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -m32 -L../lib_header/ rg2rrg.cpp function.cpp -o RG2RRG -O3 -lgspnESRG -lfl
g++ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -m32 -L../lib_header/ rg2rrg.cpp function.cpp -o RG2RRG -O3 -lgspnESRG
4 changes: 2 additions & 2 deletions WN/SOURCE/MDWN/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ RG2RRG_SOURCES = rg2rrg.cpp function.cpp general.cpp
# set the include path found by configure
RG2RRG_LDFLAGS = $(all_libraries) -L../../../../../$(PATHL)/2bin/lib/

RG2RRG_LDADD = -lgspnMCESRG -lm -lfl -lglpk
RG2RRG_LDADD = -lgspnMCESRG -lm -lglpk
MDWN2WN_SOURCES = mdwn2wn.cpp functionmdwn.cpp general.cpp

GDTMC_SOURCES = GenDTMC.cpp functionGenDTMC.cpp general.cpp
GDTMC_LDFLAGS = $(all_libraries) -L../../../../../$(PATHL)/2bin/lib/

GDTMC_LDADD = -lgspnMCESRG -lm -lfl -lglpk
GDTMC_LDADD = -lgspnMCESRG -lm -lglpk

PARSER_SOURCES= parser.cpp general.cpp
PARSER_LDFLAGS= $(all_libraries)
2 changes: 1 addition & 1 deletion WN/SOURCE/REACHAB/Makefile-ctmc
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ LIBSPOT= /root/SPOT/greatspn/i686_R2.4.21-0.13mdk/2bin/lib

COMP = $(CC) -g
CFLAG = -o
LFLAGS = -lgspnSSP -lm -lfl
LFLAGS = -lgspnSSP -lm
YACC = bison -v -p Prop
YACFLAG= -d
LEX = flex -i -PProp
Expand Down
2 changes: 1 addition & 1 deletion WN/SOURCE/RESRG/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ INCLUDES= $(all_includes) -I../../../INCLUDE '-D"const.h"="const.h"' \

# the library search path.
ESRG_CTMC_LDFLAGS = $(all_libraries) -L../../../../../$(PATHL)/2bin/lib/
ESRG_CTMC_LDADD = -lgspnMCESRG -lm -lfl
ESRG_CTMC_LDADD = -lgspnMCESRG -lm
ESRG_CTMC_CFLAGS= -Wall
noinst_HEADERS = class.h macro.h

4 changes: 2 additions & 2 deletions WN/SOURCE/SOLVEXSRG/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ COMP = $(CC) -O3
YACC = byacc
LEX = flex
CFLAG = -o
LDFLAGS = -lgspnMCDSRG -lm -lfl -lglib-2.0
LEFLAGS = -lgspnMCESRG -lm -lfl -lglib-2.0
LDFLAGS = -lgspnMCDSRG -lm -lglib-2.0
LEFLAGS = -lgspnMCESRG -lm -lglib-2.0
LIBFLAG = -L$(LIBGREAT)
INCFLAG = -I$(INCGREAT) $(GLIBINC) -I$(SRCDIR)/common/
OBJDSRG = $(OBJDIR)Gauss_Seidel.o $(OBJDIR)IndexDsrg.tab.o $(OBJDIR)IndexDsrg.o
Expand Down
2 changes: 1 addition & 1 deletion WN/SOURCE/SPOT/PROPS/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ LIBSPOT= /root/SPOT/greatspn/i686_R2.4.21-0.13mdk/2bin/lib

COMP = $(CC) -g
CFLAG = -o
LFLAGS = -lgspnSRG -lm -lfl
LFLAGS = -lgspnSRG -lm
YACC = bison -v -p Prop
YACFLAG= -d
LEX = flex -i -PProp
Expand Down

0 comments on commit 062c8ba

Please sign in to comment.