Blob Blame History Raw
diff -urN driftnet-0.1.6.old/img.h driftnet-0.1.6/img.h
--- driftnet-0.1.6.old/img.h	2002-07-09 20:26:41.000000000 +0100
+++ driftnet-0.1.6/img.h	2007-10-22 17:13:58.000000000 -0400
@@ -22,13 +22,13 @@
 
 #include <stdio.h>
 
-#include "endianness.h"
+#include <glib.h>
 
 typedef uint8_t chan;
 typedef uint32_t pel;
 
 /* Yuk. GDKRGB expects data in a specific ordering. */
-#if defined(DRIFTNET_LITTLE_ENDIAN)
+#if (G_BYTE_ORDER == G_LITTLE_ENDIAN)
 #   define PEL(r, g, b)        ((pel)((chan)(r) | ((chan)(g) << 8) | ((chan)(b) << 16)))
 #   define PELA(r, g, b, a)    ((pel)((chan)(r) | ((chan)(g) << 8) | ((chan)(b) << 16) | ((chan)(a) << 24)))
 
@@ -36,7 +36,7 @@
 #   define GETG(p)             ((chan)(((p) & (pel)0x0000ff00) >>  8))
 #   define GETB(p)             ((chan)(((p) & (pel)0x00ff0000) >> 16))
 #   define GETA(p)             ((chan)(((p) & (pel)0xff000000) >> 24))
-#elif defined(DRIFTNET_BIG_ENDIAN)
+#elif (G_BYTE_ORDER == G_BIG_ENDIAN)
 #   define PEL(r, g, b)        ((pel)(((chan)(r) << 24) | ((chan)(g) << 16) | ((chan)(b) << 8)))
 #   define PELA(r, g, b, a)    ((pel)(((chan)(r) << 24) | ((chan)(g) << 16) | ((chan)(b) << 8) | ((chan)(a))))

diff -urN driftnet-0.1.6.old/Makefile driftnet-0.1.6/Makefile
--- driftnet-0.1.6.old/Makefile	2006-04-03 13:02:13.000000000 +0100
+++ driftnet-0.1.6/Makefile	2007-10-21 22:33:35.000000000 -0400
@@ -76,41 +76,25 @@
 
 default: driftnet driftnet.1
 
-driftnet:   depend $(OBJS)
+driftnet:   $(OBJS)
 	$(CC) -o driftnet $(OBJS) $(LDFLAGS) $(LDLIBS)
 
 driftnet.1: driftnet.1.in Makefile
 	( echo '.\" DO NOT EDIT THIS FILE-- edit driftnet.1.in instead' ; sed s/@@@VERSION@@@/$(VERSION)/ ) < driftnet.1.in > driftnet.1
 
-endianness.h: endian
-	./endian > endianness.h
-
-endian: endian.c
-	$(CC) $(CFLAGS) -o endian endian.c
-
-%.o:    %.c Makefile endianness.h
+%.o:    %.c Makefile
 	$(CC) $(CFLAGS) -c -o $@ $<
 
-clean:  nodepend
-	rm -f *~ *.bak *.o core $(BINS) TAGS driftnet.1 endian endianness.h
-
+clean:
+	rm -f *~ *.bak *.o core $(BINS) TAGS driftnet.1
 tags:
 	etags *.c *.h
 
-tarball: nodepend $(SRCS) $(HDRS) $(TXTS)
+tarball: $(SRCS) $(HDRS) $(TXTS)
 	mkdir driftnet-$(VERSION)
 	set -e ; for i in Makefile $(SRCS) $(HDRS) $(TXTS) ; do cp $$i driftnet-$(VERSION)/$$i ; done
 	tar cvzf driftnet-$(VERSION).tar.gz driftnet-$(VERSION)
 	rm -rf driftnet-$(VERSION)
 	mv driftnet-$(VERSION).tar.gz ..
 	
-depend: endianness.h
-	makedepend -- $(CFLAGS) `cat endianness` -- $(SRCS)
-	touch depend
-	rm -f Makefile.bak
-
-nodepend:
-	makedepend -- --
-	rm -f depend Makefile.bak
-
 # DO NOT DELETE