Permalink
Browse files

Merge rip-border and texture-border into border.

  • Loading branch information...
1 parent eda4e09 commit ef2b2939e29cd9cbedf560a0367fac4dbe68473a @hejiann committed Aug 1, 2012
Showing with 169 additions and 745 deletions.
  1. +17 −24 Makefile
  2. +1 −0 README
  3. +31 −0 texture-border-textures.list → border-textures.list
  4. +120 −66 rip-border.c → border.c
  5. +0 −31 rip-border-textures.list
  6. +0 −624 texture-border.c
View
@@ -25,40 +25,42 @@ CFLAGS = $(GIMP_CFLAGS)
GDK_PIXBUF_CSOURCE = gdk-pixbuf-csource
-all: beautify skin-whitening rip-border texture-border
+all: beautify skin-whitening border
-install: beautify skin-whitening rip-border texture-border
+install: beautify skin-whitening border
# need fix: --install-admin-bin has issue in x86_64,
# it install the plug-in into /usr/lib/gimp/2.0/plug-ins/
# but the correct directory is /usr/lib64/gimp/2.0/plug-ins/
$(GIMPTOOL) --install-admin-bin beautify
$(GIMPTOOL) --install-admin-bin skin-whitening
- $(GIMPTOOL) --install-admin-bin rip-border
- $(GIMPTOOL) --install-admin-bin texture-border
+ $(GIMPTOOL) --install-admin-bin border
ln -sf /usr/lib/gimp/2.0/plug-ins/beautify /usr/lib64/gimp/2.0/plug-ins/beautify
ln -sf /usr/lib/gimp/2.0/plug-ins/skin-whitening /usr/lib64/gimp/2.0/plug-ins/skin-whitening
- ln -sf /usr/lib/gimp/2.0/plug-ins/rip-border /usr/lib64/gimp/2.0/plug-ins/rip-border
- ln -sf /usr/lib/gimp/2.0/plug-ins/texture-border /usr/lib64/gimp/2.0/plug-ins/texture-border
+ ln -sf /usr/lib/gimp/2.0/plug-ins/border /usr/lib64/gimp/2.0/plug-ins/border
uninstall:
$(GIMPTOOL) --uninstall-admin-bin beautify
$(GIMPTOOL) --uninstall-admin-bin skin-whitening
+ $(GIMPTOOL) --uninstall-admin-bin border
$(GIMPTOOL) --uninstall-admin-bin rip-border
$(GIMPTOOL) --uninstall-admin-bin texture-border
rm -f /usr/lib64/gimp/2.0/plug-ins/beautify
rm -f /usr/lib64/gimp/2.0/plug-ins/skin-whitening
+ rm -f /usr/lib64/gimp/2.0/plug-ins/border
rm -f /usr/lib64/gimp/2.0/plug-ins/rip-border
rm -f /usr/lib64/gimp/2.0/plug-ins/texture-border
-userinstall: beautify skin-whitening rip-border texture-border
+userinstall: beautify skin-whitening border
$(GIMPTOOL) --install-bin beautify
$(GIMPTOOL) --install-bin skin-whitening
- $(GIMPTOOL) --install-bin rip-border
- $(GIMPTOOL) --install-bin texture-border
+ $(GIMPTOOL) --uninstall-bin rip-border
+ $(GIMPTOOL) --uninstall-bin texture-border
+ $(GIMPTOOL) --install-bin border
useruninstall:
$(GIMPTOOL) --uninstall-bin beautify
$(GIMPTOOL) --uninstall-bin skin-whitening
+ $(GIMPTOOL) --uninstall-bin border
$(GIMPTOOL) --uninstall-bin rip-border
$(GIMPTOOL) --uninstall-bin texture-border
@@ -86,24 +88,15 @@ skin-whitening-images.h: skin-whitening-images.list
skin-whitening-effect.o: skin-whitening-effect.c skin-whitening-effect.h
$(CC) $(CFLAGS) -c skin-whitening-effect.c -o skin-whitening-effect.o
-rip-border: rip-border.o
- $(CC) -o $@ $^ $(LIBS)
-
-rip-border.o: rip-border.c rip-border-textures.h
- $(CC) $(CFLAGS) -c rip-border.c -o rip-border.o
-
-rip-border-textures.h: rip-border-textures.list
- $(GDK_PIXBUF_CSOURCE) --raw --build-list `cat rip-border-textures.list` > $(@F)
-
-texture-border: texture-border.o
+border: border.o
$(CC) -o $@ $^ $(LIBS)
-texture-border.o: texture-border.c texture-border-textures.h
- $(CC) $(CFLAGS) -c texture-border.c -o texture-border.o
+border.o: border.c border-textures.h
+ $(CC) $(CFLAGS) -c border.c -o border.o
-texture-border-textures.h: texture-border-textures.list
- $(GDK_PIXBUF_CSOURCE) --raw --build-list `cat texture-border-textures.list` > $(@F)
+border-textures.h: border-textures.list
+ $(GDK_PIXBUF_CSOURCE) --raw --build-list `cat border-textures.list` > $(@F)
clean:
- rm -f *.o beautify beautify-textures.h skin-whitening skin-whitening-images.h rip-border rip-border-textures.h texture-border texture-border-textures.h
+ rm -f *.o beautify beautify-textures.h skin-whitening skin-whitening-images.h border border-textures.h rip-border rip-border-textures.h texture-border texture-border-textures.h
View
1 README
@@ -47,6 +47,7 @@ CHANGELOG
2012-08-01:
Make 0.5.2 release.
+Merge rip-border and texture-border into border.
2012-07-31:
beautify: fix ABao color effect.
@@ -1,3 +1,34 @@
+texture_14911
+ ./textures/rip-border/others/14911.jpg
+texture_12847
+ ./textures/rip-border/stars/12847.jpg
+texture_201301
+ ./textures/rip-border/others/201301.jpg
+texture_201185
+ ./textures/rip-border/border/201185.jpg
+texture_111601
+ ./textures/rip-border/border/111601.jpg
+texture_201072
+ ./textures/rip-border/art/201072.jpg
+texture_15614
+ ./textures/rip-border/art/15614.jpg
+texture_201106
+ ./textures/rip-border/art/201106.jpg
+texture_12858
+ ./textures/rip-border/stars/12858.jpg
+texture_200836
+ ./textures/rip-border/art/200836.jpg
+texture_15618
+ ./textures/rip-border/stars/15618.jpg
+texture_200773
+ ./textures/rip-border/art/200773.jpg
+texture_200623
+ ./textures/rip-border/art/200623.jpg
+texture_200549
+ ./textures/rip-border/art/200549.jpg
+texture_200442
+ ./textures/rip-border/art/200442.jpg
+
texture_12854
./textures/texture-border/art/12854.jpg
texture_200542
Oops, something went wrong.

0 comments on commit ef2b293

Please sign in to comment.