X-Git-Url: https://www.kengrimes.com/gitweb/?p=henge%2Fwebcc.git;a=blobdiff_plain;f=Makefile;h=d10e17b75b2d91b2b97ca89e4428a4050b0b2d98;hp=a8aefba8fac871d86fda5e8962cca4d81b0474c0;hb=695d24d66eff41e489c7016798da5311bf81777e;hpb=d1ef6c9a1fbfaa524d2d286b72308aeec7f3cd12

diff --git a/Makefile b/Makefile
index a8aefba..d10e17b 100644
--- a/Makefile
+++ b/Makefile
@@ -28,11 +28,9 @@ SLANGS      := y rl
 # Language-specific compilers and flags passed in from environment
 c_C         := $(strip $(notdir $(CC)))
 c_FLAGS     := $(strip $(CFLAGS)) -I$(SRC_DIR)
-c_LIBS      := SDL2 wolfssl unistring
 c_SRCL      := y
 cpp_C       := $(strip $(notdir $(CXX)))
 cpp_FLAGS   := $(strip $(CXXFLAGS)) $(c_FLAGS)
-cpp_LIBS    := $(c_LIBS)
 go_C        := gccgo
 go_FLAGS    := $(c_FLAGS)
 # Source to source languages
@@ -73,7 +71,7 @@ gccgo_LD    := $(cc_LD)
 gccgo_AR    := $(cc_AR)
 gccgo_AROBJ := $(cc_AROBJ)
 # Shell functions to determine what libraries can be linked by the compiler
-cc_LDLIBS   := $(shell ls /usr/lib | grep ".o" | sed -e 's@^.*lib\([_\+a-zA-Z0-9\-]*\)\..*@\1@g')
+cc_LDLIBS   := $(shell ldconfig -p | sed -e 's@\-*[0-9\.]*\.so.*$$@@g' -e 's@\tlib@@g' -e '/[\t ]/d')
 gcc_LDLIBS  := $(cc_LDLIBS)
 emcc_LDLIBS := 
 g++_LDLIBS  := $(cc_LDLIBS)
@@ -116,7 +114,6 @@ $(eval CVSROOT_BAK := $(CVSROOT)))
 ifdef LANG_INIT
 $(foreach lang,$(LANGS),\
 $(eval $(call LANG_INIT,$(lang)))\
-$(eval $(lang)_LIBS := $(shell echo $($(lang)_LIBS | $(call AWK_REVERSE_SQUASH))))\
 )
 else
 $(error No LANG_INIT available, no languages can be compiled)