adding some -no-undefined flags and libraries for an automatic link test

also added some template references I found while still having -frepo around :)

svn path=/trunk/kdebase/konsole/; revision=41660
wilder-portage
Stephan Kulow 26 years ago
parent 2e43645911
commit ac2f0191af
  1. 9
      src/Makefile.am
  2. 2
      src/main.C
  3. 3
      src/schema.C

@ -25,12 +25,13 @@ lib_LTLIBRARIES = kwrited.la
noinst_LTLIBRARIES = libkonsole.la
libkonsole_la_SOURCES = TEWidget.C TEmuVt102.C TEScreen.C TEmulation.C TEPty.C TEHistory.C keytrans.C
# libkonsole_la_LDFLAGS = -version-info `expr $(VERSION) + $(SUBVERS)`:$(RELEASE):$(SUBVERS)
libkonsole_la_LDFLAGS = -no-undefined $(all_libraries) # -version-info `expr $(VERSION) + $(SUBVERS)`:$(RELEASE):$(SUBVERS)
libkonsole_la_LIBADD = $(LIB_KDEUI) $(LIBUTEMPTER)
# Which sources should be compiled for konsole.
kwrited_la_SOURCES = kwrited.C
kwrited_la_LIBADD = libkonsole.la $(LIB_KIMGIO) $(LIB_KDEUI) $(LIBUTEMPTER)
kwrited_la_SOURCES = kwrited.C
kwrited_la_LIBADD = libkonsole.la $(LIB_KIMGIO)
kwrited_la_LDFLAGS = $(all_libraries) -module -avoid-version
kwrited_SOURCES = dummy.C
@ -38,7 +39,7 @@ kwrited_LDADD = kwrited.la
kwrited_LDFLAGS = $(all_libraries) $(KDE_RPATH)
konsole_SOURCES = main.C schema.C session.C krootpixmap.cpp
konsole_LDADD = libkonsole.la $(LIB_KIMGIO) $(LIB_KDEUI) $(LIBUTEMPTER)
konsole_LDADD = libkonsole.la $(LIB_KIMGIO)
konsole_LDFLAGS = $(all_libraries) $(KDE_RPATH)
# kcmkonsole_SOURCES = kcmkonsole.C schema.C

@ -93,6 +93,8 @@
#include "main.h"
#include "keytrans.h"
template class QPtrDict<TESession>;
#define HERE printf("%s(%d): here\n",__FILE__,__LINE__)
#undef PACKAGE

@ -24,6 +24,9 @@ static int schema_serial = 0; //FIXME: remove,localize
static QIntDict<ColorSchema> numb2schema;
static QDict<ColorSchema> path2schema;
template class QIntDict<ColorSchema>;
template class QDict<ColorSchema>;
ColorSchema* ColorSchema::readSchema(const char* path)
{ FILE* sysin = fopen(path,"r");
char line[100]; int i;

Loading…
Cancel
Save