diff options
| -rw-r--r-- | initscripts.spec | 2 | ||||
| -rw-r--r-- | src/Makefile | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/initscripts.spec b/initscripts.spec index 6995cc98..333e176c 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -22,7 +22,7 @@ Conflicts: mkinitrd < 4.0, kernel < 2.6.12 Conflicts: ypbind < 1.6-12, psacct < 6.3.2-12, kbd < 1.06-19, lokkit < 0.50-14 Conflicts: dhclient < 3.0.3-7 Conflicts: tcsh < 6.13-5 -Conflicts: xorg-x11 +Conflicts: xorg-x11, glib2 < 2.11.1-2 #Conflicts: diskdumputils < 1.1.0 Obsoletes: rhsound sapinit Obsoletes: hotplug diff --git a/src/Makefile b/src/Makefile index 84d6d439..ba7843df 100644 --- a/src/Makefile +++ b/src/Makefile @@ -59,7 +59,7 @@ usleep: $(USLEEP_OBJS) $(CC) $(LDFLAGS) -o $@ $(USLEEP_OBJS) -Wl,-Bstatic -lpopt -Wl,-Bdynamic ppp-watch: $(PPPWATCH_OBJS) - $(CC) $(LDFLAGS) -o $@ $(PPPWATCH_OBJS) -Wl,-Bstatic `pkg-config glib-2.0 --libs` -Wl,-Bdynamic + $(CC) $(LDFLAGS) -o $@ $(PPPWATCH_OBJS) $(pkg-config glib-2.0 --libs) usernetctl.o: usernetctl.c $(CC) $(CFLAGS) -fPIE -c usernetctl.c -o usernetctl.o @@ -74,7 +74,7 @@ ppp-watch.o: ppp-watch.c $(CC) $(CFLAGS) `pkg-config glib-2.0 --cflags` -c ppp-watch.c -o ppp-watch.o rename_device: rename_device.c - $(CC) $(CFLAGS) `pkg-config glib-2.0 --cflags` -o $@ $< -Wl,-Bstatic `pkg-config glib-2.0 --libs` -Wl,-Bdynamic + $(CC) $(CFLAGS) `pkg-config glib-2.0 --cflags` -o $@ $< $(pkg-config glib-2.0 --libs) kmodule: kmodule.o $(CC) $(LDFLAGS) -o $@ $< -Wl,-Bstatic -lpopt -Wl,-Bdynamic -lkudzu -lpci |