[Chinese-commits] [zh-autoconvert] 20/26: Remove in-place modification of upstream files
Anthony Fok
foka at debian.org
Wed Nov 18 00:26:59 UTC 2015
This is an automated email from the git hooks/post-receive script.
foka pushed a commit to branch master
in repository zh-autoconvert.
commit 1a150a40adee72124a47b25bf4024f9fcb5f693c
Author: Anthony Fok <foka at debian.org>
Date: Tue Nov 17 15:51:22 2015 -0700
Remove in-place modification of upstream files
In preparation of the switch to 3.0 (quilt) source format.
---
Makefile | 12 ++++++------
autogb.c | 2 --
contrib/xchat-plugins/Makefile | 4 ++--
contrib/xchat-plugins/xchat-autob5.c | 4 ++++
contrib/xchat-plugins/xchat-autogb.c | 4 ++++
hzconvert/Makefile | 16 ++++++----------
6 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/Makefile b/Makefile
index 0346915..258afc3 100644
--- a/Makefile
+++ b/Makefile
@@ -30,12 +30,12 @@ install-home:
ln -s $(HOME)/bin/autogb $(HOME)/bin/autob5
chmod 755 $(HOME)/bin/autogb
install:
- install -s -m 755 autogb $(DESTDIR)/usr/bin
- install -s -m 755 lib/libhz.so.0.0 $(DESTDIR)/usr/lib
+ install -m 755 autogb $(DESTDIR)/usr/bin
+ install -m 755 lib/libhz.so.0.0 $(DESTDIR)/usr/lib
cd $(DESTDIR)/usr/lib;ln -s libhz.so.0.0 libhz.so.0
cd $(DESTDIR)/usr/lib;ln -s libhz.so.0 libhz.so
- install -s -m 755 lib/libhz.a $(DESTDIR)/usr/lib
- install -s -m 755 contrib/xchat-plugins/xchat-autogb.so $(DESTDIR)/usr/lib/zh-autoconvert
- install -s -m 755 contrib/xchat-plugins/xchat-autob5.so $(DESTDIR)/usr/lib/zh-autoconvert
+ install -m 755 lib/libhz.a $(DESTDIR)/usr/lib
+ install -m 755 contrib/xchat-plugins/xchat-autogb.so $(DESTDIR)/usr/share/zh-autoconvert
+ install -m 755 contrib/xchat-plugins/xchat-autob5.so $(DESTDIR)/usr/share/zh-autoconvert
install -m 644 include/*.h $(DESTDIR)/usr/include
- cd $(DESTDIR)/usr/bin; ln -s autogb $(DESTDIR)/usr/bin/autob5
+ ln -s autogb $(DESTDIR)/usr/bin/autob5
diff --git a/autogb.c b/autogb.c
index 9e99245..e2b413b 100644
--- a/autogb.c
+++ b/autogb.c
@@ -142,7 +142,5 @@ int main(int argc,char*argv[])
}
pbuf=&buff[2];
}while((count=read(0,pbuf,MAX_BUFFER))>0);
-
fflush(0);
- exit(0);
}
diff --git a/contrib/xchat-plugins/Makefile b/contrib/xchat-plugins/Makefile
index 2710257..f8cfb4a 100755
--- a/contrib/xchat-plugins/Makefile
+++ b/contrib/xchat-plugins/Makefile
@@ -5,8 +5,8 @@ LIBS= -L../../lib
all:xchat-autogb.so xchat-autob5.so
xchat-autogb.so: xchat-autogb.c
- $(CC) $(LDFLAGS) $(CFLAGS) $(LIBS) -I. -DSKIPCONFIG -fPIC -shared -Wl,-soname,xchat-autogb.so -o $@ $< -lhz -lc `pkg-config --cflags gtk+-2.0`
+ $(CC) $(LDFLAGS) $(CFLAGS) $(LIBS) -I. -DSKIPCONFIG -fPIC -shared -Wl,-soname,xchat-autogb.so -o $@ $< -lhz -lc `gtk-config --cflags`
xchat-autob5.so: xchat-autob5.c
- $(CC) $(LDFLAGS) $(CFLAGS) $(LIBS) -I. -DSKIPCONFIG -fPIC -shared -Wl,-soname,xchat-autob5.so -o $@ $< -lhz -lc `pkg-config --cflags gtk+-2.0`
+ $(CC) $(LDFLAGS) $(CFLAGS) $(LIBS) -I. -DSKIPCONFIG -fPIC -shared -Wl,-soname,xchat-autob5.so -o $@ $< -lhz -lc `gtk-config --cflags`
clean:
rm -rf *~ xchat-autogb.so xchat-autob5.so
diff --git a/contrib/xchat-plugins/xchat-autob5.c b/contrib/xchat-plugins/xchat-autob5.c
index 20145fd..49aa845 100755
--- a/contrib/xchat-plugins/xchat-autob5.c
+++ b/contrib/xchat-plugins/xchat-autob5.c
@@ -88,6 +88,8 @@ int autob5_chanmsg (struct server *serv, char *channel, char *from, char *text,
PrintText(sess," Big\n");
#endif
break;
+ default:
+ ;
}
XP_CALLNEXT(chanmsg_next, serv, channel, from, text, a, c);
@@ -125,6 +127,8 @@ int autob5_privmsg (struct server *serv, char *from, char *ip, char *text, void
PrintText(sess," Big\n");
#endif
break;
+ default:
+ ;
}
XP_CALLNEXT(privmsg_next, serv, from, ip, text, a, c);
diff --git a/contrib/xchat-plugins/xchat-autogb.c b/contrib/xchat-plugins/xchat-autogb.c
index cbdf7fb..16c5fe9 100755
--- a/contrib/xchat-plugins/xchat-autogb.c
+++ b/contrib/xchat-plugins/xchat-autogb.c
@@ -88,6 +88,8 @@ int autogb_chanmsg (struct server *serv, char *channel, char *from, char *text,
PrintText(sess," Big\n");
#endif
break;
+ default:
+ ;
}
XP_CALLNEXT(chanmsg_next, serv, channel, from, text, a, c);
@@ -125,6 +127,8 @@ int autogb_privmsg (struct server *serv, char *from, char *ip, char *text, void
PrintText(sess," Big\n");
#endif
break;
+ default:
+ ;
}
XP_CALLNEXT(privmsg_next, serv, from, ip, text, a, c);
diff --git a/hzconvert/Makefile b/hzconvert/Makefile
index d8d4d19..3fe49b8 100644
--- a/hzconvert/Makefile
+++ b/hzconvert/Makefile
@@ -1,26 +1,22 @@
CC=gcc -I../include
-CFLAGS=-O2 -Wall -g -D_REENTRANT
+CFLAGS=-O2 -Wall -g
SHARED_LIB=libhz.so
SHARED_LIB_MAJOR=$(SHARED_LIB).0
SHARED_LIB_MINOR=$(SHARED_LIB_MAJOR).0
OBJS=b2g.o b2u.o g2u.o hz2gb.o b2g_tables.o b2u_tables.o g2u_tables.o io.o unicode.o judge.o judge3.o gbpercent.o b5percent.o search.o
-STATIC_OBJS=b2g.static.o b2u.static.o g2u.static.o hz2gb.static.o b2g_tables.static.o b2u_tables.static.o g2u_tables.static.o io.static.o unicode.static.o judge.static.o judge3.static.o gbpercent.static.o b5percent.static.o search.static.o
-%.o:%.c
+%.o: %.c
$(CC) -fPIC $(CFLAGS) -c $<
-%.static.o:%.c
- $(CC) $(CFLAGS) -c $< -o $*.static.o
+all: libhzconvert
-all: share-lib static-lib
-
-share-lib: $(OBJS)
+libhzconvert: $(OBJS)
+ ar rs ../lib/libhz.a $(OBJS)
gcc -fPIC -shared -Wl,-soname,$(SHARED_LIB_MAJOR) -o ../lib/$(SHARED_LIB_MINOR) $(OBJS) -ldl
rm -f ../lib/$(SHARED_LIB_MAJOR)
rm -f ../lib/$(SHARED_LIB)
cd ../lib;ln -s $(SHARED_LIB_MINOR) $(SHARED_LIB_MAJOR)
cd ../lib;ln -s $(SHARED_LIB_MAJOR) $(SHARED_LIB)
-static-lib: $(STATIC_OBJS)
- ar rs ../lib/libhz.a $(STATIC_OBJS)
+
clean:
rm -f *.o *~ ../lib/lib*
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/chinese/zh-autoconvert.git
More information about the Chinese-commits
mailing list