X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=Makefile.am;h=9a3de9d3a3dd6bc03e005c7db8a731b1429dc32d;hb=62db8bc415c7edee5cf8aebb400cfd54b7a0df75;hp=56da179a7144a0f34e593b6bd4178ea46c92eb09;hpb=aca40c4a50bdf720b0497a1f7971069be47e5910;p=platform%2Fupstream%2Flibexif.git

diff --git a/Makefile.am b/Makefile.am
index 56da179..9a3de9d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,16 @@
-SUBDIRS = m4m po libexif test doc
+SUBDIRS = m4m po libexif test doc binary contrib
 
-EXTRA_DIST = @PACKAGE_TARNAME@.spec autogen.sh
+EXTRA_DIST = @PACKAGE_TARNAME@.spec README-Win32.txt
 
-ACLOCAL_AMFLAGS = -I m4m
+pkgconfigdir = $(libdir)/pkgconfig
+
+pkgconfig_DATA = libexif.pc
+EXTRA_DIST    += libexif.pc.in
+
+noinst_DATA = libexif-uninstalled.pc
+EXTRA_DIST += libexif-uninstalled.pc.in
+
+ACLOCAL_AMFLAGS = -I auto-m4 -I m4m
 
 doc_DATA = README AUTHORS NEWS ChangeLog ABOUT-NLS COPYING
 
@@ -11,32 +19,27 @@ doc_DATA = README AUTHORS NEWS ChangeLog ABOUT-NLS COPYING
 #
 
 # Simulate something like
-#   EXTRA_DIST_IF_EXIST = ChangeLog.cvs
-# If present, ship ChangeLog.cvs in source tarball.
+#   EXTRA_DIST_IF_EXIST = ChangeLog.git
+# If present, ship ChangeLog.git in source tarball.
 # If not present, don't ship it.
 dist-hook:
-	if test -f $(srcdir)/ChangeLog.cvs; then \
-		cp -p $(srcdir)/ChangeLog.cvs $(distdir)/ChangeLog.cvs; \
+	if test -f $(srcdir)/ChangeLog.git; then \
+		cp -p $(srcdir)/ChangeLog.git $(distdir)/ChangeLog.git; \
 	fi
 
-.PHONY: cvs-changelog
-cvs-changelog: $(srcdir)/ChangeLog.cvs
-
-.PHONY: $(srcdir)/ChangeLog.cvs
-$(srcdir)/ChangeLog.cvs:
-	if test -f "$(srcdir)/cvs2cl.usermap"; then \
-		usermap="--usermap ./cvs2cl.usermap"; \
-	else \
-		usermap=""; \
-	fi; \
-	(cd "$(srcdir)" && cvs2cl $${usermap} -f "ChangeLog.cvs")
-	
-.PHONY: cvs-tag-release
-cvs-tag-release:
+.PHONY: git-changelog
+git-changelog: $(srcdir)/ChangeLog.git
+
+.PHONY: $(srcdir)/ChangeLog.git
+$(srcdir)/ChangeLog.git:
+	(cd "$(srcdir)" && git2cl > $@)
+
+.PHONY: git-tag-release
+git-tag-release:
 	@tag="$$(echo "$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)-release" | sed 's|\.|_|g')"; \
-	echo "Are you sure you want to CVS tag \`$${tag}' your source files?"; \
+	echo "Are you sure you want to git tag \`$${tag}' your source files?"; \
 	echo "Press Ctrl-C to abort, Enter to continue."; \
 	read; \
-	cd "$(srcdir)" && cvs tag "$${tag}"
+	cd "$(srcdir)" && git tag "$${tag}"
 
 # End of Makefile.am.