fixed build files to move c++ objects to libhawk from libhawkxx
This commit is contained in:
@ -1,5 +1,7 @@
|
||||
AUTOMAKE_OPTIONS = nostdinc
|
||||
|
||||
AM_CPPFLAGS = $(PTHREAD_CFLAGS)
|
||||
|
||||
CPPFLAGS_ALL_COMMON = \
|
||||
-I$(abs_builddir) \
|
||||
-I$(abs_builddir)/../lib \
|
||||
@ -21,6 +23,6 @@ bin_PROGRAMS = hawk
|
||||
hawk_SOURCES = main.c
|
||||
hawk_CPPFLAGS = $(CPPFLAGS_ALL_COMMON)
|
||||
hawk_LDFLAGS = $(LDFLAGS_ALL_COMMON)
|
||||
hawk_LDADD = $(LIBADD_BIN_COMMON) $(SOCKET_LIBS) -lhawk
|
||||
hawk_LDADD = $(LIBADD_BIN_COMMON) $(SOCKET_LIBS) $(PTHREAD_LIBS) -lhawk
|
||||
hawk_DEPENDENCIES = ../lib/libhawk.la
|
||||
|
||||
|
@ -341,6 +341,7 @@ top_build_prefix = @top_build_prefix@
|
||||
top_builddir = @top_builddir@
|
||||
top_srcdir = @top_srcdir@
|
||||
AUTOMAKE_OPTIONS = nostdinc
|
||||
AM_CPPFLAGS = $(PTHREAD_CFLAGS)
|
||||
CPPFLAGS_ALL_COMMON = \
|
||||
-I$(abs_builddir) \
|
||||
-I$(abs_builddir)/../lib \
|
||||
@ -359,7 +360,7 @@ LIBADD_BIN_COMMON = $(LIBM)
|
||||
hawk_SOURCES = main.c
|
||||
hawk_CPPFLAGS = $(CPPFLAGS_ALL_COMMON)
|
||||
hawk_LDFLAGS = $(LDFLAGS_ALL_COMMON)
|
||||
hawk_LDADD = $(LIBADD_BIN_COMMON) $(SOCKET_LIBS) -lhawk
|
||||
hawk_LDADD = $(LIBADD_BIN_COMMON) $(SOCKET_LIBS) $(PTHREAD_LIBS) -lhawk
|
||||
hawk_DEPENDENCIES = ../lib/libhawk.la
|
||||
all: all-am
|
||||
|
||||
|
Reference in New Issue
Block a user