Merge pull request #59 from bgilbert/windres-cleanup

Simplify nip2-icon.o build

Author: jcupitt

.gitignore

@@ -30,12 +30,10 @@ po/POTFILES
 fred
 po/Makefile.in.in
 src/.deps/
-src/dummy.c
 src/gtksheet-marshal.c
 src/gtksheettypebuiltins.c
 src/lex.c
 src/nip2
-src/nip2-icon.rc
 src/parse.c
 src/parse.h
 stamp-h1

po/POTFILES.in

@@ -40,7 +40,6 @@ src/parse.c
 src/managedgvalue.c
 src/conversion.c
 src/trace.c
-src/dummy.c
 src/gtkutil.c
 src/slider.c
 src/action.c

src/Makefile.am

@@ -184,7 +184,6 @@ nip2_SOURCES = \
 	plotwindow.h \
 	model.c \
 	model.h \
-	nip2-icon.rc \
 	option.c \
 	option.h \
 	optionview.c \
@@ -296,6 +295,11 @@ nip2_SOURCES = \
 	workspaceview.c \
 	workspaceview.h 
 
+if OS_WIN32
+nip2_SOURCES += \
+	nip2-icon.rc
+endif
+
 helpindex.h: 
 	./makehelpindex.pl $(prefix) > helpindex.h
 nipmarshal.h:
@@ -304,17 +308,9 @@ nipmarshal.c:
 	echo "#include \"nipmarshal.h\"" > nipmarshal.c 
 	glib-genmarshal --prefix=nip --body nipmarshal.list >> nipmarshal.c
 
-nip2-icon.rc:
-	echo 1 ICON \"nip2-icon.ico\" > nip2-icon.rc
-
 .rc.o:
-if OS_WIN32 
 	cp ${top_srcdir}/share/nip2/data/nip2-icon.ico .
 	${WINDRES} $< -o $@ 
-else
-	echo "int poop () {}" >dummy.c 
-	$(CC) -c dummy.c -o $@
-endif
 
 # we have to replace the standard .y.c rule: we are a bison-only GLR parser,
 # so we can't use autoconf's preferred -y yacc-compatibility stuff

src/nip2-icon.rc

@@ -0,0 +1 @@
+1 ICON "nip2-icon.ico"