85c8ae7d5f
git-svn-id: svn://svn.openwrt.org/openwrt/packages@21385 3c298f89-4303-0410-b956-a3cf2f4a3e73
38 lines
1.2 KiB
Diff
38 lines
1.2 KiB
Diff
--- a/make.tmpl.in
|
|
+++ b/make.tmpl.in
|
|
@@ -116,11 +116,9 @@ ifeq ("@INTL@", "yes")
|
|
endif
|
|
|
|
LDFLAGS += -L$(top_builddir)/libdm -L$(top_builddir)/lib
|
|
-CLDFLAGS += -L$(top_builddir)/libdm -L$(top_builddir)/lib
|
|
|
|
ifeq ("@DMEVENTD@", "yes")
|
|
LDFLAGS += -L$(top_builddir)/daemons/dmeventd
|
|
- CLDFLAGS += -L$(top_builddir)/daemons/dmeventd
|
|
endif
|
|
|
|
ifeq ("@DM_COMPAT@", "yes")
|
|
@@ -291,11 +289,11 @@ TARGETS += $(LIB_SHARED).$(LIB_VERSION)
|
|
$(LIB_SHARED).$(LIB_VERSION): $(OBJECTS) $(LDDEPS)
|
|
ifeq ("@LIB_SUFFIX@","so")
|
|
$(CC) -shared -Wl,-soname,$(notdir $@) \
|
|
- $(CFLAGS) $(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@
|
|
+ $(CFLAGS) $(CLDFLAGS) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $@
|
|
endif
|
|
ifeq ("@LIB_SUFFIX@","dylib")
|
|
$(CC) -dynamiclib -dylib_current_version,$(LIB_VERSION) \
|
|
- $(CFLAGS) $(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@
|
|
+ $(CFLAGS) $(CLDFLAGS) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $@
|
|
endif
|
|
|
|
$(LIB_SHARED): $(LIB_SHARED).$(LIB_VERSION)
|
|
@@ -313,7 +311,7 @@ endif
|
|
|
|
%.so: %.a
|
|
$(CC) -shared -Wl,-soname,$(notdir $@).$(LIB_VERSION) \
|
|
- $(CFLAGS) $(CLDFLAGS) $(LIBS) -o $@ \
|
|
+ $(CFLAGS) $(CLDFLAGS) $(LDFLAGS) $(LIBS) -o $@ \
|
|
@CLDWHOLEARCHIVE@ $< @CLDNOWHOLEARCHIVE@
|
|
|
|
$(LIB_STATIC): $(OBJECTS)
|