Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added build of dynamic libraries #4

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Samples/prod/Generators/CiardoPN2000/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
noinst_PROGRAMS = Kanban FMS philo ring robin

Kanban_LDFLAGS = -static-libgcc -static-libstdc++ $(LDFLAGS)
FMS_LDFLAGS = -static-libgcc -static-libstdc++ $(LDFLAGS)
philo_LDFLAGS = -static-libgcc -static-libstdc++ $(LDFLAGS)
ring_LDFLAGS = -static-libgcc -static-libstdc++ $(LDFLAGS)
robin_LDFLAGS = -static-libgcc -static-libstdc++ $(LDFLAGS)

Kanban_SOURCES = Kanban.cpp
FMS_SOURCES = FMS.cpp
Expand Down
4 changes: 4 additions & 0 deletions Samples/prod/Generators/Other/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
noinst_PROGRAMS = philo philob mutex MutexMefosyloma

philo_LDFLAGS = -static-libgcc -static-libstdc++ $(LDFLAGS)
philob_LDFLAGS = -static-libgcc -static-libstdc++ $(LDFLAGS)
mutex_LDFLAGS = -static-libgcc -static-libstdc++ $(LDFLAGS)
mutexMefosyloma_LDFLAGS = -static-libgcc -static-libstdc++ $(LDFLAGS)

mutex_SOURCES = mutex.cpp
philo_SOURCES = philo.cpp
Expand Down
2 changes: 1 addition & 1 deletion antlr.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ cd -
# ---------------
# install libits related tools with :

# ./configure --with-antlrc="$tmp"/usr/local/ --with-antlrjar="$tmp"/usr/local/lib/antlr-3.4-complete.jar
./configure --with-antlrc="$tmp"/usr/local/ --with-antlrjar="$tmp"/usr/local/lib/antlr-3.4-complete.jar
6 changes: 3 additions & 3 deletions bin/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -46,20 +46,20 @@ LDADDFLAGS = $(LIBITS_PATH) $(LIBDDD_PATH) $(LIBDDD_LINK) $(LIBEXPAT_PATH) $(L
its_reach_SOURCES = main.cpp EarlyBreakObserver.hh Property.hh Property.cpp MaxComputer.hh MaxComputer.cpp SMTExporter.hh SMTExporter.cpp ExactStateCounter.cpp ExactStateCounter.hh ToTransRel.hh ToTransRel.cpp

its_reach_LDADD = $(LDADDFLAGS)
its_reach_LDFLAGS = -fwhole-program
its_reach_LDFLAGS = -static-libgcc -static-libstdc++ $(LDFLAGS) -fwhole-program
#-static -all-static
# -export-dynamic

dve2gal_SOURCES = dve2galmain.cpp

dve2gal_LDADD = $(LDADDFLAGS)
dve2gal_LDFLAGS = -fwhole-program
dve2gal_LDFLAGS = -static-libgcc -static-libstdc++ $(LDFLAGS) -fwhole-program
# -export-dynamic

gal2c_SOURCES = gal2cmain.cpp

gal2c_LDADD = $(LDADDFLAGS)
gal2c_LDFLAGS = -fwhole-program
gal2c_LDFLAGS = -static-libgcc -static-libstdc++ $(LDFLAGS) -fwhole-program

#gal_test_SOURCES = test-gal.cpp
# philo.hh philo.cpp
Expand Down
5 changes: 3 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ AC_PROG_RANLIB
# we make static libs (use ranlib)
# we make shared libs (use libtool)
m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
LT_INIT([disable-shared])
LT_INIT([])

AC_LIBTOOL_DLOPEN

Expand Down Expand Up @@ -187,7 +187,8 @@ AM_PROG_LEX
AC_PROG_YACC

CPPFLAGS="-Wno-unused-local-typedefs $CPPFLAGS"
LDFLAGS="-static-libgcc -static-libstdc++ $LDFLAGS"
LDFLAGS="-lDDD -lantlr3c -lgmp -lexpat -lgmpxx -L/home/franck/.local/lib $(LDFLAGS)"
#LDFLAGS = -static-libgcc -static-libstdc++ $(LDFLAGS)

# define HAS_STDC_HEADERS
AC_HEADER_STDC
Expand Down
3 changes: 3 additions & 0 deletions demo/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ noinst_PROGRAMS = philoITS tokenITS
# ringIPN robinIPN cliservIPN simpleIPN hanoiIPN kanbanIPN
lib_LTLIBRARIES = libtokens.la libphiloSumo.la

philoITS_LDFLAGS = -static-libgcc -static-libstdc++ $(LDFLAGS)
tokenITS_LDFLAGS = -static-libgcc -static-libstdc++ $(LDFLAGS)

IPNLIBPATH= $(top_builddir)/lib/libITS.a

if WITH_LIBDDD_PATH
Expand Down
Loading