Blame fido-shared-library.patch
|
|
f60a6cf |
diff --git Makefile.am Makefile.am
|
|
|
f60a6cf |
index ed3b4d5..86984fa 100644
|
|
|
f60a6cf |
--- Makefile.am
|
|
|
f60a6cf |
+++ Makefile.am
|
|
|
f60a6cf |
@@ -26,7 +26,7 @@ WARN_CFLAGS = @WARN_CFLAGS@
|
|
|
f60a6cf |
|
|
|
f60a6cf |
AM_CFLAGS = $(WARN_CFLAGS)
|
|
|
f60a6cf |
|
|
|
f60a6cf |
-SUBDIRS = . include lib src utils doc
|
|
|
f60a6cf |
+SUBDIRS = . include src utils doc
|
|
|
f60a6cf |
|
|
|
f60a6cf |
DIST_SUBDIRS = $(SUBDIRS)
|
|
|
f60a6cf |
|
|
|
f60a6cf |
diff --git include/Makefile.am include/Makefile.am
|
|
|
f60a6cf |
index 77a511a..5d5b20a 100644
|
|
|
f60a6cf |
--- include/Makefile.am
|
|
|
f60a6cf |
+++ include/Makefile.am
|
|
|
f60a6cf |
@@ -20,8 +20,6 @@
|
|
|
f60a6cf |
## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
|
f60a6cf |
##
|
|
|
f60a6cf |
|
|
|
f60a6cf |
-SUBDIRS = joedog
|
|
|
f60a6cf |
-
|
|
|
f60a6cf |
WARN_CFLAGS = @WARN_CFLAGS@
|
|
|
f60a6cf |
AM_CFLAGS = $(WARN_CFLAGS)
|
|
|
f60a6cf |
|
|
|
f60a6cf |
diff --git src/Makefile.am src/Makefile.am
|
|
|
f60a6cf |
index b7efb29..3aacfae 100644
|
|
|
f60a6cf |
--- src/Makefile.am
|
|
|
f60a6cf |
+++ src/Makefile.am
|
|
|
f60a6cf |
@@ -25,11 +25,9 @@ WARN_CFLAGS = @WARN_CFLAGS@
|
|
|
f60a6cf |
|
|
|
f60a6cf |
AM_CFLAGS = $(WARN_CFLAGS) $(PTHREAD_CFLAGS)
|
|
|
f60a6cf |
|
|
|
f60a6cf |
-LDFLAGS = $(PTHREAD_LDFLAGS)
|
|
|
f60a6cf |
+LDFLAGS := $(PTHREAD_LDFLAGS) $(LDFLAGS)
|
|
|
f60a6cf |
|
|
|
f60a6cf |
-fido_LDADD = $(top_srcdir)/lib/joedog/libjoedog.la
|
|
|
f60a6cf |
-
|
|
|
f60a6cf |
-fido_DEPENDENCIES = $(top_srcdir)/lib/joedog/libjoedog.la
|
|
|
f60a6cf |
+fido_LDFLAGS = -ljoedog -lpthread
|
|
|
f60a6cf |
|
|
|
f60a6cf |
fido_SOURCES = \
|
|
|
f60a6cf |
array.c array.h \
|