# HG changeset patch
# User nenolod
# Date 1150270069 25200
# Node ID 2419d0da172532020fb8546d9cec98d97d173d55
# Parent  e67fad649f58e5fbbd322630a17a695a502144b2
[svn] - boom

diff -r e67fad649f58 -r 2419d0da1725 ChangeLog
--- a/ChangeLog	Wed Jun 14 00:16:06 2006 -0700
+++ b/ChangeLog	Wed Jun 14 00:27:49 2006 -0700
@@ -1,3 +1,13 @@
+2006-06-14 07:16:06 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [1332]
+  - make it prettier
+  
+
+  Changes:        Modified:
+  +0 -5           trunk/Makefile  
+  +8 -0           trunk/mk/objective.mk  
+
+
 2006-06-14 07:14:13 +0000  William Pitcock <nenolod@nenolod.net>
   revision [1330]
   - shut a make error up by using sinclude instead of normal include when rules.mk doesn't exist yet
diff -r e67fad649f58 -r 2419d0da1725 audtool/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/audtool/Makefile	Wed Jun 14 00:27:49 2006 -0700
@@ -0,0 +1,29 @@
+include ../mk/rules.mk
+include ../mk/objective.mk
+
+beepincludedir = $(includedir)/audacious
+
+OBJECTIVE_BINS = audtool
+
+LDFLAGS += -Wl,-export-dynamic
+LDADD = \
+	$(GTK_LIBS)      \
+	$(LIBGLADE_LIBS) \
+	-L.. $(LTLIBINTL)     \
+	-L../libaudacious -laudacious
+
+CFLAGS += \
+	$(GTK_CFLAGS)      \
+	$(LIBGLADE_CFLAGS) \
+	$(BEEP_DEFINES)    \
+	$(ARCH_DEFINES)    \
+	-I..    \
+	-I../intl
+
+SOURCES = audtool.c
+
+OBJECTS = ${SOURCES:.c=.o}
+
+audtool: $(OBJECTS)
+	$(CC) $(LDFLAGS) $(OBJECTS) $(LDADD) -o $@ -Wl,-rpath,${libdir}
+	@printf "%10s     %-20s\n" LINK $@
diff -r e67fad649f58 -r 2419d0da1725 audtool/Makefile.in
--- a/audtool/Makefile.in	Wed Jun 14 00:16:06 2006 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-include ../mk/rules.mk
-include ../mk/objective.mk
-
-beepincludedir = $(includedir)/audacious
-
-OBJECTIVE_BINS = audtool
-
-LDFLAGS += -Wl,-export-dynamic
-LDADD = \
-	$(GTK_LIBS)      \
-	$(LIBGLADE_LIBS) \
-	-L.. $(LTLIBINTL)     \
-	-L../libaudacious -laudacious
-
-CFLAGS += \
-	$(GTK_CFLAGS)      \
-	$(LIBGLADE_CFLAGS) \
-	$(BEEP_DEFINES)    \
-	$(ARCH_DEFINES)    \
-	-I..    \
-	-I../intl
-
-SOURCES = audtool.c
-
-OBJECTS = ${SOURCES:.c=.o}
-
-audtool: $(OBJECTS)
-	$(CC) $(LDFLAGS) $(OBJECTS) $(LDADD) -o $@ -Wl,-rpath,${libdir}
-	@printf "%10s     %-20s\n" LINK $@
diff -r e67fad649f58 -r 2419d0da1725 audtool/Makefile.in.standalone
--- a/audtool/Makefile.in.standalone	Wed Jun 14 00:16:06 2006 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-CC		= @CC@
-RM		= @RM@
-MV		= @MV@
-CP		= @CP@
-INSTALL		= @INSTALL@
-PREFIX		= @prefix@
-BIN		= audtool
-LDFLAGS		= @LDFLAGS@
-CPPFLAGS	= @CPPFLAGS@
-
-# enforce -pthread on systems for now, some systems seem not to pick
-# it up automatically. --nenolod
-LIBS		= -pthread @LIBS@ @AUDACIOUS_LIBS@
-CFLAGS		= -pthread @CFLAGS@ @AUDACIOUS_CFLAGS@
-
-default: all
-
-BASE_SRCS = audtool.c
-
-SRCS = ${BASE_SRCS}
-
-OBJS = ${SRCS:.c=.o}
-
-all: audtool
-
-build: all
-
-audtool: $(OBJS)
-	${CC} ${CFLAGS} -o $@ ${OBJS} ${LIBS}
-
-install:
-	$(INSTALL) -m 755 -d $(DESTDIR)$(PREFIX)
-	$(INSTALL) -m 755 -d $(DESTDIR)$(PREFIX)/bin
-	$(INSTALL) -m 755 -c $(BIN) $(DESTDIR)$(PREFIX)/bin
-
-.c.o:
-	${CC} ${CPPFLAGS} ${CFLAGS} -c $< -o $@
-
-clean:
-	${RM} -f *.o audtool.core core audtool
-
-distclean: clean
-	${RM} -f Makefile config.h config.status config.log