File loki_update-Makefile.diff of Package loki_setup

Index: loki_update/Makefile
===================================================================
--- loki_update.orig/Makefile
+++ loki_update/Makefile
@@ -24,30 +24,27 @@ endif
 CFLAGS += -I$(SETUPDB) -I$(SNARF) -DVERSION=\"$(VERSION)\" -DDYNAMIC_UI
 CFLAGS += -DPROTOTYPES # for snarf
 CFLAGS += -DUI_LIBDIR=\"$(UI_LIBDIR)\" -DDATADIR=\"$(DATADIR)\" -DLOCALEDIR=\"$(LOCALEDIR)\"
-CFLAGS += $(shell gtk-config --cflags) $(shell libglade-config --cflags)
-CFLAGS += $(shell xml-config --cflags)
+CFLAGS += $(shell pkg-config --cflags gtk+-2.0 libglade-2.0) -DGTK_ENABLE_BROKEN
+CFLAGS += $(shell xml2-config --cflags)
 LFLAGS = -rdynamic
 LFLAGS += -Wl,-Bstatic
 # Used for non-blocking gethostbyname
 # You can find Ares at: ftp://athena-dist.mit.edu/pub/ATHENA/ares
 LFLAGS += -L./libs/ares-1.1.0 -lares
 LFLAGS += -L$(SETUPDB)/$(arch) -lsetupdb
-LFLAGS += $(shell xml-config --libs)
-LFLAGS += -lxml -lz
 LFLAGS += -Wl,-Bdynamic
+LFLAGS += $(shell xml2-config --libs) -lz
 LFLAGS += -lm -ldl
 
 TTY_LFLAGS =
 
 GTK_ST_LFLAGS = -Wl,-Bstatic
-GTK_ST_LFLAGS += $(shell libglade-config --libs)
-GTK_ST_LFLAGS += $(shell gtk-config --libs)
+GTK_ST_LFLAGS += $(shell pkg-config --libs libglade-2.0)
+GTK_ST_LFLAGS += $(shell pkg-config --libs gtk+-2.0)
 GTK_ST_LFLAGS += -Wl,-Bdynamic
 
-GTK_SH_LFLAGS = -Wl,-Bstatic
-GTK_SH_LFLAGS += $(shell libglade-config --libs)
-GTK_SH_LFLAGS += -Wl,-Bdynamic
-GTK_SH_LFLAGS += $(shell gtk-config --libs)
+GTK_SH_LFLAGS += $(shell pkg-config --libs libglade-2.0)
+GTK_SH_LFLAGS += $(shell pkg-config --libs gtk+-2.0)
 
 CORE_OBJS = loki_update.o prefpath.o url_paths.o meta_url.o \
             load_products.o load_patchset.o patchset.o urlset.o \
@@ -61,7 +58,7 @@ OBJS = $(CORE_OBJS) $(SNARF_OBJS)
 
 CORE_SRCS = $(CORE_OBJS:.o=.c)
 
-all: $(TARGET) tty_ui.so gtk_st_ui.so gtk_sh_ui.so
+all: $(TARGET) tty_ui.so gtk_sh_ui.so
 
 gtk_sh_ui.so: gtk_ui.o
 	$(CC) -o $@ -shared $^ $(GTK_SH_LFLAGS)
@@ -137,7 +134,7 @@ install-data:
 LOCALES = fr
 
 po/$(TARGET).po: $(CORE_SRCS) loki_update.glade
-	libglade-xgettext loki_update.glade > po/$(TARGET).po
+	xgettext --language=glade loki_update.glade -o po/$(TARGET).po
 	xgettext -p po -j -d $(TARGET) --keyword=_ $(CORE_SRCS)
 
 update-po: po/$(TARGET).po