qi-hardware/fped
1
0
Fork 0
mirror of git://projects.qi-hardware.com/fped.git synced 2024-11-18 07:58:16 +02:00
Code

Makefile: switched from SVN to git

Browse Source 
- Makefile (CFLAGS): renamed cpp macro SVN_VERSION to VERSION
- Makefile (SVN_VERSION, SVN_STATUS): renamed to GIT_VERSION and
  GIT_STATUS and switched to corresponding git command
- Makefile (.PHONY, update): removed this little-used target
This commit is contained in:
Werner Almesberger 2011-07-28 06:29:19 -03:00
parent 6396ca8499
commit 6cadac8977
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Makefile
View File

@ -1,8 +1,8 @@
# #
# Makefile - Makefile of fped, the footprint editor # Makefile - Makefile of fped, the footprint editor
# #
# Written 2009, 2010 by Werner Almesberger # Written 2009-2011 by Werner Almesberger
# Copyright 2009, 2010 by Werner Almesberger # Copyright 2009-2011 by Werner Almesberger
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -38,7 +38,7 @@ LIBS_GTK = `pkg-config --libs gtk+-2.0`
CFLAGS_WARN = -Wall -Wshadow -Wmissing-prototypes \ CFLAGS_WARN = -Wall -Wshadow -Wmissing-prototypes \
-Wmissing-declarations -Wno-format-zero-length -Wmissing-declarations -Wno-format-zero-length
CFLAGS = -g -std=gnu99 $(CFLAGS_GTK) -DCPP='"cpp"' \ CFLAGS = -g -std=gnu99 $(CFLAGS_GTK) -DCPP='"cpp"' \
-DSVN_VERSION='"$(SVN_VERSION)$(SVN_STATUS)"' $(CFLAGS_WARN) -DVERSION='"$(GIT_VERSION)$(GIT_STATUS)"' $(CFLAGS_WARN)
SLOPPY = -Wno-unused -Wno-implicit-function-declaration \ SLOPPY = -Wno-unused -Wno-implicit-function-declaration \
-Wno-missing-prototypes -Wno-missing-declarations -Wno-missing-prototypes -Wno-missing-declarations
LDFLAGS = LDFLAGS =
@ -46,9 +46,8 @@ LDLIBS = -lm -lfl $(LIBS_GTK)
YACC = bison -y YACC = bison -y
YYFLAGS = -v YYFLAGS = -v
SVN_VERSION:=$(shell svn info -R | sed '/Last Changed Rev: /s///p;d' | \ GIT_VERSION:=$(shell git rev-parse HEAD | cut -c 1-7)
sort -r | sed 1q) GIT_STATUS:=$(shell [ -z "`git status -s -uno`" ] || echo +)
SVN_STATUS:=$(shell [ -z "`svn status -q`" ] || echo +)
# ----- Verbosity control ----------------------------------------------------- # ----- Verbosity control -----------------------------------------------------
@ -188,9 +187,3 @@ install: all
uninstall: uninstall:
rm -f $(DESTDIR)/$(PREFIX)/bin/fped rm -f $(DESTDIR)/$(PREFIX)/bin/fped
# ----- SVN update ------------------------------------------------------------
update:
svn update
$(MAKE) dep all

8
gui.c
View File

@ -1,8 +1,8 @@
/* /*
* gui.c - Editor GUI core * gui.c - Editor GUI core
* *
* Written 2009, 2010 by Werner Almesberger * Written 2009-2011 by Werner Almesberger
* Copyright 2009, 2010 by Werner Almesberger * Copyright 2009-2011 by Werner Almesberger
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -385,9 +385,9 @@ int gui_main(void)
root = gtk_window_new(GTK_WINDOW_TOPLEVEL); root = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_position(GTK_WINDOW(root), GTK_WIN_POS_CENTER); gtk_window_set_position(GTK_WINDOW(root), GTK_WIN_POS_CENTER);
gtk_window_set_default_size(GTK_WINDOW(root), 620, 460); gtk_window_set_default_size(GTK_WINDOW(root), 620, 460);
if (*SVN_VERSION) if (*VERSION)
gtk_window_set_title(GTK_WINDOW(root), gtk_window_set_title(GTK_WINDOW(root),
"fped (rev " SVN_VERSION ")"); "fped (rev " VERSION ")");
else else
gtk_window_set_title(GTK_WINDOW(root), "fped"); gtk_window_set_title(GTK_WINDOW(root), "fped");