Files imms-1.0/.vars.mk.in.rej.swp and imms-1.0.beep/.vars.mk.in.rej.swp differ
diff -ruN imms-1.0/rules.mk imms-1.0.beep/rules.mk
--- imms-1.0/rules.mk	2004-02-14 04:10:55.204482264 -0500
+++ imms-1.0.beep/rules.mk	2004-02-14 04:05:16.132029112 -0500
@@ -11,12 +11,12 @@
 	$(AR) $(ARFLAGS) $@ $(CORE_OBJ)
 
 %.o: %.cc vars.mk
-	@$(CXX) $(CPPFLAGS) -M -E $< > .$*.d
-	$(CXX) $(CPPFLAGS) -c $< -o $@
+	@$(CXX) $(CPPFLAGS) $(CXXFLAGS) -M -E $< > .$*.d
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@
 
 %.o: %.c vars.mk
-	@$(CXX) $(CFLAGS) -M -E $< > .$*.d
-	$(CC) $(CFLAGS) -c $< -o $@
+	@$(CC) $(CPPFLAGS) $(CFLAGS) -M -E $< > .$*.d
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
 
 .PHONY: clean distclean
 
diff -ruN imms-1.0/vars.mk.in imms-1.0.beep/vars.mk.in
--- imms-1.0/vars.mk.in	2004-02-14 04:10:55.204482264 -0500
+++ imms-1.0.beep/vars.mk.in	2004-02-14 04:10:26.861791008 -0500
@@ -9,8 +9,9 @@
 CORE_OBJ = imms.o immsdb.o fetcher.o picker.o spectrum.o sqldb.o \
 	   songinfo.o regexx.o strmanip.o levenshtein.o xidle.o md5.o
 
-CFLAGS = `beep-config --cflags` @DEBUG_CFLAGS@ -Wall -fPIC -D_REENTRANT
-CPPFLAGS = ${CFLAGS} -pedantic -fno-rtti
+CFLAGS = -Wall -fPIC -D_REENTRANT @CFLAGS@
+CXXFLAGS = -fPIC -D_REENTRANT -pedantic -fno-rtti @CXXFLAGS@
+CPPFLAGS = `beep-config --cflags` @CPPFLAGS@
 LDFLAGS = `beep-config --libs` -L/usr/X11R6/lib -lX11 @LIBS@
 ARFLAGS = rs