blautenb 2003/04/23 17:23:49
Modified: c/src Makefile.in
c/src/samples Makefile.in
c/src/tools Makefile.in
Log:
Moved library linkage to fix Derek's problems building samples
Revision Changes Path
1.4 +1 -1 xml-security/c/src/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-security/c/src/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.in 23 Apr 2003 10:11:49 -0000 1.3
+++ Makefile.in 24 Apr 2003 00:23:48 -0000 1.4
@@ -154,7 +154,7 @@
lib: prepare ${THISLIB}
${THISLIB}: $(LIB_OBJ_FILES)
- $(MAKE_SHARED) $(LDFLAGS) $(LIBS) $(LIB_OBJ_FILES) -o $@
+ $(MAKE_SHARED) $(LDFLAGS) $(LIB_OBJ_FILES) $(LIBS) -o $@
(cd $(LIB_DIR) ; rm -f $(LIBMAJORNAME) ; $(LN_S) $(LIBNAME)
$(LIBMAJORNAME))
(cd $(LIB_DIR) ; rm -f $(LIBSHORTNAME) ; $(LN_S) $(LIBNAME)
$(LIBSHORTNAME))
1.3 +2 -2 xml-security/c/src/samples/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-security/c/src/samples/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.in 23 Apr 2003 10:11:50 -0000 1.2
+++ Makefile.in 24 Apr 2003 00:23:48 -0000 1.3
@@ -104,7 +104,7 @@
# ${CC1} -c ${CPPFLAGS} ${XSEC_INCL} -o [EMAIL PROTECTED] $<
${BINDIR}/simpleHMAC: ${OBJDIR}/simpleHMAC${OBJSUFFIX}
${OBJDIR}/IOStreamOutputter${OBJSUFFIX}
- $(LINK) $(LDFLAGS) $(LDXSEC) $(LIBS) $^ -o $@
+ $(LINK) $(LDFLAGS) $^ $(LDXSEC) $(LIBS) -o $@
#========================= simpleValidate ========================
@@ -112,7 +112,7 @@
# ${CC1} -c ${CPPFLAGS} ${XSEC_INCL} -o [EMAIL PROTECTED] $<
${BINDIR}/simpleValidate: ${OBJDIR}/simpleValidate${OBJSUFFIX}
${OBJDIR}/IOStreamOutputter${OBJSUFFIX}
- $(LINK) $(LDFLAGS) $(LDXSEC) $(LIBS) $^ -o $@
+ $(LINK) $(LDFLAGS) $^ $(LDXSEC) $(LIBS) -o $@
#============================= Clean =============================
1.4 +6 -6 xml-security/c/src/tools/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-security/c/src/tools/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.in 23 Apr 2003 10:11:50 -0000 1.3
+++ Makefile.in 24 Apr 2003 00:23:48 -0000 1.4
@@ -111,7 +111,7 @@
${CC1} -c ${CPPFLAGS} ${XSEC_INCL} -o [EMAIL PROTECTED] $<
${BINDIR}/xtest: ${OBJDIR}/xtest${OBJSUFFIX}
- $(LINK) $(LDFLAGS) $(LDXSEC) $(LIBS) $< -o $@
+ $(LINK) $(LDFLAGS) $< $(LDXSEC) $(LIBS) -o $@
#============================== c14n =============================
@@ -119,7 +119,7 @@
${CC1} -c ${CPPFLAGS} ${XSEC_INCL} -o [EMAIL PROTECTED] $<
${BINDIR}/c14n: ${OBJDIR}/c14n${OBJSUFFIX}
- $(LINK) $(LDFLAGS) $(LDXSEC) $(LIBS) $< -o $@
+ $(LINK) $(LDFLAGS) $< $(LDXSEC) $(LIBS) -o $@
#============================ checksig ===========================
@@ -128,7 +128,7 @@
${CC1} -c ${CPPFLAGS} ${XSEC_INCL} -o [EMAIL PROTECTED] $<
${BINDIR}/checksig: ${OBJDIR}/checksig${OBJSUFFIX}
- $(LINK) $(LDFLAGS) $(LDXSEC) $(LIBS) $< -o $@
+ $(LINK) $(LDFLAGS) $< $(LDXSEC) $(LIBS) -o $@
#========================== templatesign =========================
@@ -136,7 +136,7 @@
${CC1} -c ${CPPFLAGS} ${XSEC_INCL} -o [EMAIL PROTECTED] $<
${BINDIR}/templatesign: ${OBJDIR}/templatesign${OBJSUFFIX}
- $(LINK) $(LDFLAGS) $(LDXSEC) $(LIBS) $< -o $@
+ $(LINK) $(LDFLAGS) $< $(LDXSEC) $(LIBS) -o $@
#============================= txfmout ============================
@@ -144,7 +144,7 @@
${CC1} -c ${CPPFLAGS} ${XSEC_INCL} -o [EMAIL PROTECTED] $<
${BINDIR}/txfmout: ${OBJDIR}/txfmout${OBJSUFFIX}
- $(LINK) $(LDFLAGS) $(LDXSEC) $(LIBS) $< -o $@
+ $(LINK) $(LDFLAGS) $< $(LDXSEC) $(LIBS) -o $@
#============================= siginf =============================
@@ -152,7 +152,7 @@
${CC1} -c ${CPPFLAGS} ${XSEC_INCL} -o [EMAIL PROTECTED] $<
${BINDIR}/siginf: ${OBJDIR}/siginf${OBJSUFFIX}
- $(LINK) $(LDFLAGS) $(LDXSEC) $(LIBS) $< -o $@
+ $(LINK) $(LDFLAGS) $< $(LDXSEC) $(LIBS) -o $@
#============================= Clean =============================
