diff -Nur gpe-go-0.05/Makefile gpe-go-0.05.new/Makefile
--- gpe-go-0.05/Makefile 2003-11-09 20:28:40.000000000 +0000
+++ gpe-go-0.05.new/Makefile 2007-01-16 10:15:06.000000000 +0000
@@ -3,7 +3,7 @@
PACKAGE = gpe-go
ifndef PREFIX
-PREFIX = /usr/local
+PREFIX = /usr
endif
ifndef DEBUG
@@ -24,18 +24,9 @@
GTKCFLAGS = `pkg-config --cflags gtk+-2.0`
GTKLDFLAGS += `pkg-config --libs gtk+-2.0`
-CPPFLAGS = $(GTKCFLAGS) -D_GNU_SOURCE
-ifeq ($(DEBUG),yes)
-CFLAGS += -O2 -g -DDEBUG=yes
-LDFLAGS += -g
-else
-CFLAGS += -Os -fomit-frame-pointer
-endif
-CFLAGS += -Wall -I../../base/libgpewidget
-CPPFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\"
-CFLAGS += -MD
-
-LDFLAGS += -L../../base/libgpewidget -lgpewidget
+PACKAGE_CFLAGS += $(STANDARD_CFLAGS) $(GTKCFLAGS) $(GPECFLAGS)
+PACKAGE_CPPFLAGS += $(STANDARD_CPPFLAGS) -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\"
+PACKAGE_LDFLAGS += $(STANDARD_LDFLAGS) $(GTKLDFLAGS) $(GPELIBS)
.SUFFIXES: .d
@@ -50,7 +41,7 @@
all: $(PACKAGE)
$(PACKAGE): $(OBJS)
- $(CC) -o $@ $^ $(GTKLDFLAGS) $(LDFLAGS)
+ $(CC) -o $@ $^ $(LDFLAGS) $(PACKAGE_LDFLAGS)
install-program: $(PACKAGE).desktop all
install -D $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE)