[pkg-otr-team] [irssi-plugin-otr] 45/167: * Makefile.mingw: * po/Makefile.mingw: Cleaned up Makefile.mingw files, removed "install" target, added "zip" target

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to tag 4.0.0
in repository irssi-plugin-otr.

commit 066e60beee1eb2472b88874d3dd91df1acc00915
Author: cypherpunk <cypherpunk>
Date:   Sat Jul 28 15:15:45 2007 +0000

    	* Makefile.mingw:
    	* po/Makefile.mingw: Cleaned up Makefile.mingw files, removed
    	"install" target, added "zip" target
---
 ChangeLog         |  4 ++++
 Makefile.mingw    | 61 ++++++++++++++++++++++++++++++++++---------------------
 po/Makefile.mingw | 20 ++----------------
 3 files changed, 44 insertions(+), 41 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b118a95..69f2249 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
 	* configure.ac: Fix PKG_CHECK_MODULES so that it gives a
 	sensible error if the packages aren't found
 
+	* Makefile.mingw:
+	* po/Makefile.mingw: Cleaned up Makefile.mingw files, removed
+	"install" target, added "zip" target
+
 2007-07-26
 
 	* gtk-dialog.c:
diff --git a/Makefile.mingw b/Makefile.mingw
index 03238c3..c32593d 100644
--- a/Makefile.mingw
+++ b/Makefile.mingw
@@ -16,58 +16,73 @@ GTK_HDRS ?= `pkg-config --cflags glib-2.0 gtk+-2.0`
 # The location of the libotr include files.  Note that if, for example,
 # the full path of message.h is /usr/include/libotr/message.h, you
 # should put /usr/include on the next line, not /usr/include/libotr
-LIBOTRINCDIR = /usr/include
+LIBOTRINCDIR = /usr/i586-mingw32msvc/include
 
 # The locataion of libotr.a.
-LIBOTRLIBDIR = /usr/lib
+LIBOTRLIBDIR = /usr/i586-mingw32msvc/lib
 
 # Location of libintl.h
 LIBINTLINCDIR = /usr/i586-mingw32msvc/include
 
-# Location of libintl.a and libiconv.a
+# Location of intl.dll
 LIBINTLLIBDIR = /usr/i586-mingw32msvc/lib
 
+# Installed location of libotr toolkit
+LIBOTRBINDIR = /usr/i586-mingw32msvc/bin
+
+# Source location of libotr
+LIBOTRSRCDIR = ../libotr
+
 # The target
-TARGET = pidgin-otr.so
+TARGET = pidgin-otr.dll
 
-ifdef WIN32
 CC = i586-mingw32msvc-gcc
-LIBOTRINCDIR = /usr/i586-mingw32msvc/include
-LIBOTRLIBDIR = /usr/i586-mingw32msvc/lib
-TARGET = pidgin-otr.dll
 LDFLAGS = -Wl,--enable-auto-image-base
 LDLIBS = $(LIBOTRLIBDIR)/libotr.a -lgtk-win32-2.0 -lglib-2.0 -lgdk_pixbuf-2.0 \
 	 -lgobject-2.0 -lpidgin -llibpurple -lgcrypt -lgpg-error \
 	 -L$(LIBINTLLIBDIR) -lintl
-else
-FPIC = -fPIC
-LDFLAGS = -module -avoid-version
-LDLIBS = -lotr -lgcrypt
-endif
-
-# Install directory
-PIDGINDIR = /usr/lib/pidgin
-INSTALLDIR = $(DESTDIR)$(PIDGINDIR)
 
 CC ?= gcc
-override CFLAGS += -g -Wall -I$(PIDGIN_HEADERS) -I$(PURPLE_HEADERS) \
+override CFLAGS += -g -O2 -Wall -I$(PIDGIN_HEADERS) -I$(PURPLE_HEADERS) \
 	$(GTK_HDRS) -I$(LIBOTRINCDIR) $(FPIC) -DUSING_GTK -DPURPLE_PLUGINS \
 	-DPIDGIN_OTR_VERSION=\"$(PIDGIN_OTR_VERSION)\" \
 	-DPIDGIN_NAME=\"Pidgin\" -I$(LIBINTLINCDIR) -DENABLE_NLS \
 	-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\"
  
 all: $(TARGET)
+	$(MAKE) -C po -f Makefile.mingw
 
 $(TARGET): otr-plugin.o ui.o dialogs.o gtk-ui.o gtk-dialog.o
 	$(CC) -g -shared $(LDFLAGS) $^ -o $@ $(LDLIBS)
 
-install: all
-	install -d $(INSTALLDIR)
-	install -m 0755 $(TARGET) $(INSTALLDIR)
-	$(MAKE) -C po -f Makefile.mingw install
-
 clean:
 	rm -f *.o
 	rm -f $(TARGET)
+	$(MAKE) -C po -f Makefile.mingw clean
 
 distclean: clean
+	$(MAKE) -C po -f Makefile.mingw distclean
+
+## Package up all the pieces needed to build the installer
+zip: all
+	mkdir win32_export
+	# Copy pieces over from the libotr source dir
+	for f in otr_mackey.exe otr_parse.exe otr_remac.exe otr_modify.exe \
+		otr_readforge.exe  otr_sesskeys.exe; do \
+			cp -a $(LIBOTRBINDIR)/$$f win32_export/; done
+	cp -a $(LIBOTRSRCDIR)/README win32_export/README.Toolkit.txt
+	cp -a $(LIBOTRSRCDIR)/Protocol-v2.html win32_export/Protocol-v2.html
+	cp -a $(LIBOTRSRCDIR)/COPYING win32_export/COPYING.txt
+	cp -a $(LIBOTRSRCDIR)/COPYING.LIB win32_export/COPYING.LIB.txt
+	cp -a $(TARGET) win32_export/
+	cp -a README win32_export/README.txt
+	cp -a packaging/windows/pidgin-otr.nsi win32_export/
+	cp -a po/*.gmo win32_export/
+	cd win32_export; \
+	i586-mingw32msvc-strip *.exe *.dll; \
+	perl -pi -e 's/$$/\r/' README.Toolkit.txt Protocol-v2.html \
+		COPYING.txt COPYING.LIB.txt README.txt; \
+	zip ../pidgin-otr-$(PIDGIN_OTR_VERSION).zip README.txt \
+		README.Toolkit.txt Protocol-v2.html COPYING.txt \
+		COPYING.LIB.txt *.exe *.dll *.gmo *.nsi
+	rm -rf win32_export
diff --git a/po/Makefile.mingw b/po/Makefile.mingw
index c1fbfe8..fbeac6d 100644
--- a/po/Makefile.mingw
+++ b/po/Makefile.mingw
@@ -11,10 +11,6 @@ GETTEXT_PACKAGE = pidgin-otr
 # msgfmt command
 GMSGFMT ?= /usr/bin/msgfmt
 
-# Path where the mo files should be installed
-PIDGIN_PO_DIR ?= /usr/share/locale
-INSTALL_PO_DIR = $(DESTDIR)$(PIDGIN_PO_DIR)
-
 .SUFFIXES:
 .SUFFIXES: .po .gmo
 
@@ -39,19 +35,7 @@ CATALOGS = $(patsubst %.po,%.gmo,$(wildcard *.po))
 
 all: $(CATALOGS)
 
-install: all
-	mkdir -p $(INSTALL_PO_DIR)
-	@catalogs='$(CATALOGS)'; \
-	for cat in $$catalogs; do \
-	  cat=`basename $$cat`; \
-	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
-	  dir=$(INSTALL_PO_DIR)/$$lang/LC_MESSAGES; \
-	  mkdir -p $$dir; \
-	  if test -r $$cat; then \
-	    cp $$cat $$dir/$(PACKAGE).mo; \
-	    echo "installing $$cat as $$dir/$(GETTEXT_PACKAGE).mo"; \
-	  fi; \
-	done
-
 clean:
 	rm -f *.gmo
+
+distclean: clean

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-otr/packages/irssi-plugin-otr.git