1 Index: rosetta/Makefile
2 ===================================================================
3 --- rosetta.orig/Makefile 2005-03-04 02:54:06.000000000 +0000
4 +++ rosetta/Makefile 2005-03-07 12:18:35.284433304 +0000
11 OPTIONS = -DNEW_NORMALIZE_CODE -DNEW_MATCH_CODE
13 -ifeq ($(CROSSCOMPILE),yes)
16 -STRIP = arm-linux-strip
18 -PKG_CONFIG_PATH=/skiff/local/arm-linux/lib/pkgconfig/
20 -LDFLAGS += -L/skiff/local/arm-linux/lib
21 -LDFLAGS += -L/skiff/local/arm-linux/lib/X11
22 -LDFLAGS += -lX11 -lXtst -lXext -lm
29 -LDFLAGS += -L/usr/X11R6/lib -lX11 -lXtst -lm
36 CFLAGS += -MD $(OPTIONS) -g
37 -CFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DGTK_PACKAGE=\"$(GTK_PACKAGE)\" -DPREFIX=\"$(PREFIX)\"
38 -CFLAGS += -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\"
39 -CFLAGS += -DPACKAGE_DATA_DIR=\"$(PREFIX)/share/\"
40 -CFLAGS += -I$(GPE_DIR)/libgpewidget
41 -CFLAGS += -DENABLE_NLS -D_GNU_SOURCE
42 -CFLAGS += $(GPECFLAGS)
44 +PACKAGE_CPPFLAGS += -DPACKAGE=\"$(PACKAGE)\" $(OPTIONS)
45 +PACKAGE_CPPFLAGS += -DGTK_PACKAGE=\"$(GTK_PACKAGE)\"
46 +PACKAGE_CPPFLAGS += -DPREFIX=\"$(PREFIX)\"
47 +PACKAGE_CPPFLAGS += -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\"
48 +PACKAGE_CPPFLAGS += -DPACKAGE_DATA_DIR=\"$(PREFIX)/share/\"
49 +PACKAGE_CPPFLAGS += -DENABLE_NLS
51 +PACKAGE_CFLAGS += `pkg-config --cflags gtk+-2.0 libgpewidget x11 xrandr xrender xft xtst xext xau` -D_GNU_SOURCE
52 +PACKAGE_LDFLAGS += `pkg-config --libs gtk+-2.0 libgpewidget x11 xrandr xrender xft xtst xext xau`
53 +PACKAGE_LDFLAGS += -L/skiff/local/arm-linux/lib
54 +PACKAGE_LDFLAGS += -L/skiff/local/arm-linux/lib/X11
55 +PACKAGE_LDFLAGS += -lm
61 all: $(PACKAGE) $(GTK_PACKAGE)
64 - $(CC) -o $@ $^ $(LDFLAGS)
65 + $(CC) -o $@ $^ $(PACKAGE_LDFLAGS) $(LDFLAGS)
67 $(GTK_PACKAGE): $(GTK_OBJS)
68 - $(CC) -o $@ $^ $(LDFLAGS) $(GPELIBS) -lXrender -lXinerama
69 + $(CC) -o $@ $^ $(LDFLAGS) $(PACKAGE_LDFLAGS) $(GPELIBS)
72 + $(CC) $(PACKAGE_CPPFLAGS) $(PACKAGE_CFLAGS) -c $< -o $@
74 +install: install-program
76 install -D $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE)
77 install -D $(GTK_PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(GTK_PACKAGE)
79 mkdir -p $(DESTDIR)/etc
80 install -m 644 $(PACKAGE).png $(DESTDIR)$(PREFIX)/share/pixmaps/$(PACKAGE).png
81 install -m 644 penwrite24.png $(DESTDIR)$(PREFIX)/share/pixmaps/penwrite24.png
82 - install -m 644 $(PACKAGE).pc $(DESTDIR)$(PREFIX)/share/$(PACKAGE)
83 +# install -m 644 $(PACKAGE).pc $(DESTDIR)$(PREFIX)/share/$(PACKAGE)
84 install -m 666 $(PACKAGE).db $(DESTDIR)$(PREFIX)/share/$(PACKAGE)
85 install -m 644 $(PACKAGE).conf $(DESTDIR)/etc
86 mkdir -p $(DESTDIR)$(PREFIX)/share/applications