I thought Richard Stallman was a douchebag before it was cool.

[citadel.git] / libcitadel / Makefile.in

diff --git a/libcitadel/Makefile.in b/libcitadel/Makefile.in
index 5aa22235207b91ac5bdaf2a1167e62ac8913512a..6273e2c4157d91a79cc36c64e00c47388ed22717 100755 (executable)
--- a/libcitadel/Makefile.in
+++ b/libcitadel/Makefile.in
@@ -65,8 +65,8 @@ install-pkgconfigDATA: $(pkgconfig_DATA)
 clean:
        echo "Cleaning: $(LIBRARY) *.o *.lo *.gcda *.gcov *.gcno"
        cd lib && rm -f $(LIBRARY) *.o *.lo *.gcda *.gcov *.gcno
-       echo "Cleaning: $(LIBRARY) .libs _libs b64/*.o b64/*.lo b64/.libs b64/*.gcda b64/*.gcov b64/*.gcno xdgmime/*.o xdgmime/*.lo xdgmime/.libs xdgmime/*.gcda xdgmime/*.gcov xdgmime/*.gcno"
-       cd lib && rm -rf .libs _libs b64/*.o b64/*.lo b64/.libs b64/*.gcda b64/*.gcov b64/*.gcno xdgmime/*.o xdgmime/*.lo xdgmime/.libs xdgmime/*.gcda xdgmime/*.gcov xdgmime/*.gcno
+       echo "Cleaning: $(LIBRARY) .libs _libs xdgmime/*.o xdgmime/*.lo xdgmime/.libs xdgmime/*.gcda xdgmime/*.gcov xdgmime/*.gcno"
+       cd lib && rm -rf .libs _libs xdgmime/*.o xdgmime/*.lo xdgmime/.libs xdgmime/*.gcda xdgmime/*.gcov xdgmime/*.gcno
        rm -rf .libs libcitadel.la
 
 clobber: clean
@@ -79,6 +79,7 @@ install: $(LIBRARY) $(APIHEADER) install-pkgconfigDATA
        $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
        $(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(DESTDIR)$(libdir)/$(LIBRARY)
        for FN in $(APIHEADER) ; do $(INSTALL_DATA) $$FN $(DESTDIR)$(includedir) ; done
+       ldconfig || true
 
 uninstall:
        $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$(LIBRARY)
@@ -86,7 +87,7 @@ uninstall:
 
 # for VPATH builds (invoked by configure)
 mkdir-init:
-       @for d in lib lib/xdgmime lib/b64 tests ; do \
+       @for d in lib lib/xdgmime ; do \
                (mkdir $$d 2> /dev/null || test 1) ; \
        done
 
@@ -114,6 +115,8 @@ LINK_CXX_EXE = $(LIBTOOL) $(LTFLAGS) --mode=link $(CXXCOMPILE) $(LDFLAGS) -o $@
 LIB_OBJS = lib/libcitadel.lo \
        lib/mime_parser.lo \
        lib/tools.lo \
+       lib/decode.lo \
+       lib/base64.lo \
        lib/vcard.lo \
        lib/vnote.lo \
        lib/hash.lo \
@@ -122,8 +125,6 @@ LIB_OBJS = lib/libcitadel.lo \
        lib/json.lo \
        lib/wildfire.lo \
        lib/urlhandling.lo \
-       lib/b64/cencode.lo \
-       lib/b64/cdecode.lo \
        lib/xdgmime/xdgmime.lo \
        lib/xdgmime/xdgmimeglob.lo \
        lib/xdgmime/xdgmimeint.lo \
@@ -131,7 +132,8 @@ LIB_OBJS = lib/libcitadel.lo \
        lib/xdgmime/xdgmimealias.lo \
        lib/xdgmime/xdgmimeparent.lo \
        lib/xdgmime/xdgmimecache.lo \
-       lib/html_to_ascii.lo
+       lib/html_to_ascii.lo \
+       lib/array.lo
 
 $(LIBRARY): $(LIB_OBJS)
        $(LINK_LIB) $(LIB_OBJS)
@@ -139,14 +141,14 @@ $(LIBRARY): $(LIB_OBJS)
 lib/libcitadel.lo: lib/libcitadel.c lib/libcitadel.h
 lib/mime_parser.lo: lib/mime_parser.c lib/libcitadel.h
 lib/tools.lo: lib/tools.c lib/libcitadel.h
+lib/decode.lo: lib/decode.c lib/libcitadel.h
+lib/base64.lo: lib/base64.c lib/libcitadel.h
 lib/vcard.lo: lib/vcard.c lib/libcitadel.h
 lib/vnote.lo: lib/vnote.c lib/libcitadel.h
 lib/lookup3.lo: lib/lookup3.c lib/libcitadel.h
 lib/hash.lo: lib/hash.c lib/libcitadel.h
 lib/json.lo: lib/json.c lib/libcitadel.h
 lib/wildfire.lo: lib/wildfire.c lib/libcitadel.h
-lib/b64/cencode.lo: lib/b64/cencode.c 
-lib/b64/cdecode.lo: lib/b64/cdecode.c
 lib/xdgmime/xdgmime.lo: lib/xdgmime/xdgmime.c 
 lib/xdgmime/xdgmimeglob.lo:  lib/xdgmime/xdgmimeglob.c 
 lib/xdgmime/xdgmimeint.lo:  lib/xdgmime/xdgmimeint.c 
@@ -155,6 +157,9 @@ lib/xdgmime/xdgmimealias.lo:  lib/xdgmime/xdgmimealias.c
 lib/xdgmime/xdgmimeparent.lo:  lib/xdgmime/xdgmimeparent.c 
 lib/xdgmime/xdgmimecache.lo: lib/xdgmime/xdgmimecache.c
 lib/html_to_ascii.lo: lib/html_to_ascii.c
+lib/tools.lo: lib/tools.c
+lib/decode.lo: lib/decode.c
+lib/base64.lo: lib/base64.c
 
 .SUFFIXES: .c .cpp .lo .o