diff options
| -rw-r--r-- | Makefile.rules.in | 2 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | example/Makefile.in | 3 |
3 files changed, 3 insertions, 8 deletions
diff --git a/Makefile.rules.in b/Makefile.rules.in index eab2c5d..6f3a4e5 100644 --- a/Makefile.rules.in +++ b/Makefile.rules.in @@ -59,7 +59,7 @@ $(eval $(call generic_template,$(1))) $(SUBDIR)$(1): $$($(1)-extra-targets) $$($(1)-obj) @echo -e " LD\t\t$$@" - $$(CC) $$($(1)-obj) $$(LDFLAGS) -o $$@ + $$(CC) $$($(1)-obj) $$($(1)-ldflags) $$(LDFLAGS) -o $$@ all_targets += $(SUBDIR)$(1) $(1)-clean_files += $(SUBDIR)$(1) diff --git a/configure.ac b/configure.ac index aa9362c..e8cc903 100644 --- a/configure.ac +++ b/configure.ac @@ -32,12 +32,6 @@ AC_CHECK_LIB([nl], [nl_socket_alloc], , AC_CHECK_LIB([nl-dect], [nl_dect_cluster_alloc], , AC_MSG_ERROR([No suitable version of libnl-dect found])) -AC_CHECK_LIB([event], [event_init], , - AC_MSG_ERROR([No suitable version of libevent found])) - -AC_CHECK_LIB([SDL], [SDL_OpenAudio], , - AC_MSG_ERROR([No suitable version of libsdl found])) - # Checks for header files. AC_HEADER_STDC AC_HEADER_ASSERT diff --git a/example/Makefile.in b/example/Makefile.in index c29aac7..34e9eaf 100644 --- a/example/Makefile.in +++ b/example/Makefile.in @@ -1,4 +1,4 @@ -LDFLAGS += -Wl,-rpath $(PWD)/src -Lsrc -ldect +LDFLAGS += -Wl,-rpath $(PWD)/src -Lsrc -ldect -levent PROGRAMS += cc ss mm-fp mm-pp discover hijack cc-destdir := usr/bin @@ -6,6 +6,7 @@ cc-obj += event_ops.o cc-obj += dummy_ops.o cc-obj += audio.o cc-obj += cc.o +cc-ldflags += -lSDL ss-destdir := usr/bin ss-obj += event_ops.o |