X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;ds=sidebyside;f=libcitadel%2FMakefile.in;h=5aa22235207b91ac5bdaf2a1167e62ac8913512a;hb=HEAD;hp=4f9e76c4517ae591a2a30975edcb7adb9b8ee4fb;hpb=e815bc2c94a280aabc5780c950ce923ebce0fb04;p=citadel.git

diff --git a/libcitadel/Makefile.in b/libcitadel/Makefile.in
index 4f9e76c45..6273e2c41 100755
--- a/libcitadel/Makefile.in
+++ b/libcitadel/Makefile.in
@@ -24,6 +24,7 @@ top_builddir = .
 pkgconfig_DATA = libcitadel.pc
 pkgconfigdir = $(libdir)/pkgconfig
 
+
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
@@ -34,11 +35,17 @@ LIBRARY = libcitadel.la
 
 DESTDIR = $(INSTALL_ROOT)
 
-default:  buildlib
+default: buildinfo buildlib
 
 buildlib: $(LIBRARY)
 
-all: $(LIBRARY)
+all: buildinfo $(LIBRARY)
+
+buildinfo:
+	echo
+	echo LTCompile:	$(LTCOMPILE) -o $@ -c
+	echo
+
 
 libcitadel.pc: $(top_builddir)/config.status libcitadel.pc.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
@@ -56,7 +63,10 @@ install-pkgconfigDATA: $(pkgconfig_DATA)
 
 
 clean:
-	cd lib && rm -f $(LIBRARY) *.o *.lo && rm -rf .libs _libs
+	echo "Cleaning: $(LIBRARY) *.o *.lo *.gcda *.gcov *.gcno"
+	cd lib && rm -f $(LIBRARY) *.o *.lo *.gcda *.gcov *.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
@@ -69,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)
@@ -76,7 +87,7 @@ uninstall:
 
 # for VPATH builds (invoked by configure)
 mkdir-init:
-	@for d in lib ; do \
+	@for d in lib lib/xdgmime ; do \
 		(mkdir $$d 2> /dev/null || test 1) ; \
 	done
 
@@ -85,7 +96,7 @@ CXX = @CXX@
 LIBTOOL = @LIBTOOL@
 
 INCLUDES = -I$(srcdir)/lib -I.
-LDFLAGS = @LDFLAGS@
+LDFLAGS = @LDFLAGS@ @LIBS@
 CPPFLAGS = @CPPFLAGS@
 CFLAGS = @CFLAGS@
 CXXFLAGS = @CXXFLAGS@
@@ -104,16 +115,25 @@ 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 \
 	lib/lookup3.lo \
+	lib/stringbuf.lo \
+	lib/json.lo \
+	lib/wildfire.lo \
+	lib/urlhandling.lo \
 	lib/xdgmime/xdgmime.lo \
 	lib/xdgmime/xdgmimeglob.lo \
 	lib/xdgmime/xdgmimeint.lo \
 	lib/xdgmime/xdgmimemagic.lo \
 	lib/xdgmime/xdgmimealias.lo \
 	lib/xdgmime/xdgmimeparent.lo \
-	lib/xdgmime/xdgmimecache.lo
+	lib/xdgmime/xdgmimecache.lo \
+	lib/html_to_ascii.lo \
+	lib/array.lo
 
 $(LIBRARY): $(LIB_OBJS)
 	$(LINK_LIB) $(LIB_OBJS)
@@ -121,9 +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/xdgmime/xdgmime.lo: lib/xdgmime/xdgmime.c 
 lib/xdgmime/xdgmimeglob.lo:  lib/xdgmime/xdgmimeglob.c 
 lib/xdgmime/xdgmimeint.lo:  lib/xdgmime/xdgmimeint.c 
@@ -131,14 +156,21 @@ lib/xdgmime/xdgmimemagic.lo:  lib/xdgmime/xdgmimemagic.c
 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
 
 .cpp.o:
+	echo "CC+ $<"
 	$(CXXCOMPILE) -o $@ -c $<
 .c.o:
+	echo "CC $<"
 	$(COMPILE) -o $@ -c $<
 .c.lo:
+	echo "CC: $<"
 	$(LTCOMPILE) -o $@ -c $<
 
 .PHONY: buildlib all \
@@ -146,7 +178,7 @@ lib/xdgmime/xdgmimecache.lo: lib/xdgmime/xdgmimecache.c
 	dist distdir \
 	install uninstall
 
-
+.SILENT:
 
 
 #