aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Seebach <peter.seebach@windriver.com>2016-05-12 13:22:08 -0500
committerPeter Seebach <peter.seebach@windriver.com>2016-05-12 13:22:08 -0500
commit23b628b5f7ef1a118e63cb92c8d58b4412f8fabb (patch)
treed79d7a98ff3a62a4ead2b02334977cd9b328f9f3
parent58e4171525d5f319906a53ea169eac74631e7605 (diff)
downloadpseudo-23b628b5f7ef1a118e63cb92c8d58b4412f8fabb.tar.gz
pseudo-23b628b5f7ef1a118e63cb92c8d58b4412f8fabb.tar.bz2
pseudo-23b628b5f7ef1a118e63cb92c8d58b4412f8fabb.zip
respect $(LDFLAGS)
Respect environment-set $(LDFLAGS). Fix provided by kergoth, I'm just merging it.
-rw-r--r--ChangeLog.txt3
-rw-r--r--Makefile.in8
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index e4c218a..0abe3ff 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,6 @@
+2016-05-12:
+ * (seebs) merge kergoth's fix to respect $(LDFLAGS) from environment.
+
2016-03-25:
* (seebs) handle deletion of xattrs, renames, and so on. Eww.
diff --git a/Makefile.in b/Makefile.in
index 6511814..22ef625 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -109,26 +109,26 @@ pseudo: $(PSEUDO)
$(PSEUDO): $(BIN) pseudo.o $(SHOBJS) $(DBOBJS) pseudo_client.o pseudo_server.o pseudo_ipc.o
$(CC) $(CFLAGS) $(CFLAGS_PSEUDO) -o $(PSEUDO) \
pseudo.o pseudo_server.o pseudo_client.o pseudo_ipc.o \
- $(DBOBJS) $(SHOBJS) $(DB_LDFLAGS) $(CLIENT_LDFLAGS)
+ $(DBOBJS) $(SHOBJS) $(LDFLAGS) $(DB_LDFLAGS) $(CLIENT_LDFLAGS)
pseudolog: $(PSEUDOLOG)
$(PSEUDOLOG): $(BIN) pseudolog.o $(SHOBJS) $(DBOBJS) pseudo_client.o pseudo_ipc.o
$(CC) $(CFLAGS) $(CFLAGS_PSEUDO) -o $(PSEUDOLOG) pseudolog.o pseudo_client.o pseudo_ipc.o \
- $(DBOBJS) $(SHOBJS) $(DB_LDFLAGS) $(CLIENT_LDFLAGS)
+ $(DBOBJS) $(SHOBJS) $(LDFLAGS) $(DB_LDFLAGS) $(CLIENT_LDFLAGS)
pseudodb: $(PSEUDODB)
$(PSEUDODB): $(BIN) pseudodb.o $(SHOBJS) $(DBOBJS) pseudo_ipc.o
$(CC) $(CFLAGS) $(CFLAGS_PSEUDO) -o $(PSEUDODB) pseudodb.o \
- $(DBOBJS) $(SHOBJS) pseudo_ipc.o $(DB_LDFLAGS) $(CLIENT_LDFLAGS)
+ $(DBOBJS) $(SHOBJS) pseudo_ipc.o $(LDFLAGS) $(DB_LDFLAGS) $(CLIENT_LDFLAGS)
libpseudo: $(LIBPSEUDO)
$(LIBPSEUDO): $(LIB) $(WRAPOBJS) pseudo_client.o pseudo_ipc.o $(SHOBJS)
$(CC) $(CFLAGS) $(CFLAGS_PSEUDO) -shared -o $(LIBPSEUDO) \
pseudo_client.o pseudo_ipc.o \
- $(WRAPOBJS) $(SHOBJS) $(CLIENT_LDFLAGS)
+ $(WRAPOBJS) $(SHOBJS) $(LDFLAGS) $(CLIENT_LDFLAGS)
# *everything* now relies on stuff that's generated in the
# wrapper process.