$NetBSD: patch-ej,v 1.7 2004/01/15 10:15:14 markd Exp $ --- kxkb/Makefile.in.orig 2004-01-02 14:06:04.000000000 +1300 +++ kxkb/Makefile.in @@ -431,11 +431,11 @@ KDE_OPTIONS = nofinal bin_PROGRAMS = kxkb -kxkb_SOURCES = dummy.cpp +kxkb_SOURCES = kxkb_main.cpp kxkb_LDFLAGS = $(all_libraries) $(KDE_RPATH) -kxkb_LDADD = kxkb.la -lxkbfile +kxkb_LDADD = libkxkb_main.la -lxkbfile -lib_LTLIBRARIES = kxkb.la +lib_LTLIBRARIES = libkxkb_main.la kxkb.la kde_module_LTLIBRARIES = kcm_keyboard.la #>- kcm_keyboard_la_SOURCES = rules.cpp kcmlayout.cpp pixmap.cpp kcmmisc.cpp kcmmiscwidget.ui @@ -444,9 +444,13 @@ kcm_keyboard_la_SOURCES=rules.cpp kcmlay kcm_keyboard_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined kcm_keyboard_la_LIBADD = $(XTESTLIB) $(LIB_KIO) -lxkbfile -kxkb_la_SOURCES = kxkb.cpp rules.cpp extension.cpp pixmap.cpp +libkxkb_main_la_SOURCES = kxkb.cpp rules.cpp extension.cpp pixmap.cpp +libkxkb_main_la_LDFLAGS = $(all_libraries) +libkxkb_main_la_LIBADD = -lX11 -lXext $(LIB_KDEUI) -lxkbfile + +kxkb_la_SOURCES = kxkb_main.cpp kxkb_la_LDFLAGS = $(all_libraries) -module -avoid-version -kxkb_la_LIBADD = -lX11 -lXext $(LIB_KDEUI) -lxkbfile +kxkb_la_LIBADD = libkxkb_main.la data_DATA = keyboard.desktop data2_DATA = keyboard_layout.desktop @@ -466,31 +470,38 @@ am_kcm_keyboard_la_OBJECTS = rules.lo kc #>- kcm_keyboard_la_OBJECTS = $(am_kcm_keyboard_la_OBJECTS) #>+ 1 kcm_keyboard_la_OBJECTS = rules.lo kcmlayout.lo pixmap.lo kcmmisc.lo kcmmiscwidget.lo -kxkb_la_DEPENDENCIES = -am_kxkb_la_OBJECTS = kxkb.lo rules.lo extension.lo pixmap.lo +kxkb_la_DEPENDENCIES = libkxkb_main.la +am_kxkb_la_OBJECTS = kxkb_main.lo #>- kxkb_la_OBJECTS = $(am_kxkb_la_OBJECTS) #>+ 1 -kxkb_la_OBJECTS = kxkb.lo rules.lo extension.lo pixmap.lo +kxkb_la_OBJECTS = kxkb_main.lo +libkxkb_main_la_DEPENDENCIES = +am_libkxkb_main_la_OBJECTS = kxkb.lo rules.lo extension.lo pixmap.lo +#>- libkxkb_main_la_OBJECTS = $(am_libkxkb_main_la_OBJECTS) +#>+ 1 +libkxkb_main_la_OBJECTS = kxkb.lo rules.lo extension.lo pixmap.lo bin_PROGRAMS = kxkb$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) -am_kxkb_OBJECTS = dummy.$(OBJEXT) +am_kxkb_OBJECTS = kxkb_main.$(OBJEXT) #>- kxkb_OBJECTS = $(am_kxkb_OBJECTS) #>+ 1 -kxkb_OBJECTS = dummy.$(OBJEXT) -kxkb_DEPENDENCIES = kxkb.la +kxkb_OBJECTS = kxkb_main.$(OBJEXT) +kxkb_DEPENDENCIES = libkxkb_main.la DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles -#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/extension.Plo \ +#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/extension.Plo \ #>- @AMDEP_TRUE@ ./$(DEPDIR)/kcmlayout.Plo ./$(DEPDIR)/kcmmisc.Plo \ -#>- @AMDEP_TRUE@ ./$(DEPDIR)/kxkb.Plo ./$(DEPDIR)/pixmap.Plo \ +#>- @AMDEP_TRUE@ ./$(DEPDIR)/kxkb.Plo ./$(DEPDIR)/kxkb_main.Plo \ +#>- @AMDEP_TRUE@ ./$(DEPDIR)/kxkb_main.Po ./$(DEPDIR)/pixmap.Plo \ #>- @AMDEP_TRUE@ ./$(DEPDIR)/rules.Plo -#>+ 5 -@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/kcmmiscwidget.P ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/extension.Plo \ +#>+ 6 +@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/kcmmiscwidget.P ./$(DEPDIR)/extension.Plo \ @AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcmlayout.Plo ./$(DEPDIR)/kcmmisc.Plo \ -@AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxkb.Plo ./$(DEPDIR)/pixmap.Plo \ +@AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxkb.Plo ./$(DEPDIR)/kxkb_main.Plo \ +@AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxkb_main.Po ./$(DEPDIR)/pixmap.Plo \ @AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/rules.Plo #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ @@ -512,7 +523,7 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ DIST_SOURCES = $(kcm_keyboard_la_SOURCES) $(kxkb_la_SOURCES) \ - $(kxkb_SOURCES) + $(libkxkb_main_la_SOURCES) $(kxkb_SOURCES) DATA = $(data_DATA) $(data2_DATA) $(services_DATA) @@ -523,7 +534,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r check-recursive installcheck-recursive DIST_COMMON = Makefile.am Makefile.in TODO DIST_SUBDIRS = $(SUBDIRS) -SOURCES = $(kcm_keyboard_la_SOURCES) $(kxkb_la_SOURCES) $(kxkb_SOURCES) +SOURCES = $(kcm_keyboard_la_SOURCES) $(kxkb_la_SOURCES) $(libkxkb_main_la_SOURCES) $(kxkb_SOURCES) #>- all: all-recursive #>+ 1 @@ -603,6 +614,8 @@ clean-libLTLIBRARIES: $(CXXLINK) -rpath $(kde_moduledir) $(kcm_keyboard_la_LDFLAGS) $(kcm_keyboard_la_OBJECTS) $(kcm_keyboard_la_LIBADD) $(LIBS) kxkb.la: $(kxkb_la_OBJECTS) $(kxkb_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kxkb_la_LDFLAGS) $(kxkb_la_OBJECTS) $(kxkb_la_LIBADD) $(LIBS) +libkxkb_main.la: $(libkxkb_main_la_OBJECTS) $(libkxkb_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkxkb_main_la_LDFLAGS) $(libkxkb_main_la_OBJECTS) $(libkxkb_main_la_LIBADD) $(LIBS) binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) @@ -642,11 +655,12 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/extension.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kcmlayout.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kcmmisc.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kxkb.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kxkb_main.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kxkb_main.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixmap.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rules.Plo@am__quote@ @@ -875,7 +889,7 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 -KDE_DIST=kxkb.desktop rules.h extension.h keyboard.desktop keyboard_layout.desktop kcmmisc.h uninstall.desktop kcmmiscwidget.ui LICENSE kxkb.h kcmlayout.h configure.in.in kxkbbindings.cpp pixmap.h +KDE_DIST=pixmap.h kxkb.h kcmmisc.h configure.in.in keyboard_layout.desktop kcmlayout.h kcmmiscwidget.ui kxkbbindings.cpp extension.h kxkb.desktop LICENSE Makefile.in.rej keyboard.desktop uninstall.desktop rules.h DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) @@ -1051,9 +1065,6 @@ install-data-local: uninstall.desktop messages: rc.cpp $(XGETTEXT) $(kxkb_la_SOURCES) kxkbbindings.cpp -o $(podir)/kxkb.pot $(XGETTEXT) rules.cpp kcmlayout.cpp pixmap.cpp kcmmisc.cpp rc.cpp kxkbbindings.cpp -o $(podir)/kcmlayout.pot - -dummy.cpp: - echo > dummy.cpp # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: @@ -1144,13 +1155,13 @@ kde-rpo-clean: -rm -f *.rpo #>+ 11 -kcmmisc.lo: kcmmisc.moc -$(srcdir)/rules.cpp: kcmmiscwidget.h -kxkb.o: kxkb.moc -kcmlayout.o: kcmlayout.moc +$(srcdir)/kcmlayout.cpp: kcmmiscwidget.h $(srcdir)/kcmmisc.cpp: kcmmiscwidget.h -kcmlayout.lo: kcmlayout.moc +$(srcdir)/pixmap.cpp: kcmmiscwidget.h kxkb.lo: kxkb.moc -$(srcdir)/kcmlayout.cpp: kcmmiscwidget.h +kcmlayout.o: kcmlayout.moc +kcmlayout.lo: kcmlayout.moc +kxkb.o: kxkb.moc +$(srcdir)/rules.cpp: kcmmiscwidget.h kcmmisc.o: kcmmisc.moc -$(srcdir)/pixmap.cpp: kcmmiscwidget.h +kcmmisc.lo: kcmmisc.moc